Merge topic 'retore-vtkVariant-stream-back-to-dec'

jcfr · kwrobot · commit f86a870aa011 · 2017-05-24T10:24:35.000-04:00
dc7c62a Ensure vtkVariant stream associated with << operator is set back to "dec". Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !2869
diff --git a/Common/Core/vtkVariant.cxx b/Common/Core/vtkVariant.cxx
@@ -1089,7 +1089,7 @@ ostream& operator << ( ostream& os, const vtkVariant& val )
   case VTK_OBJECT:
     if ( val.Data.VTKObject )
     {
-      os << "(" << val.Data.VTKObject->GetClassName() << ")" << hex << val.Data.VTKObject;
+      os << "(" << val.Data.VTKObject->GetClassName() << ")" << hex << val.Data.VTKObject << dec;
     }
     else
     {

Original file line number	Diff line number	Diff line change
`@@ -1089,7 +1089,7 @@ ostream& operator << ( ostream& os, const vtkVariant& val )`
`1089`	`1089`	`case VTK_OBJECT:`
`1090`	`1090`	`if ( val.Data.VTKObject )`
`1091`	`1091`	`{`
`1092`		`- os << "(" << val.Data.VTKObject->GetClassName() << ")" << hex << val.Data.VTKObject;`
	`1092`	`+ os << "(" << val.Data.VTKObject->GetClassName() << ")" << hex << val.Data.VTKObject << dec;`
`1093`	`1093`	`}`
`1094`	`1094`	`else`
`1095`	`1095`	`{`