Commit 13d76cca authored by Brad King's avatar Brad King

ENH: Adding use of long long or __int64 if they are available to read Int64...

ENH: Adding use of long long or __int64 if they are available to read Int64 and UInt64 data arrays even when 64-bit ids are off.
parent d43551b9
......@@ -20,7 +20,7 @@
#include <ctype.h>
vtkCxxRevisionMacro(vtkXMLDataElement, "1.19");
vtkCxxRevisionMacro(vtkXMLDataElement, "1.20");
vtkStandardNewMacro(vtkXMLDataElement);
//----------------------------------------------------------------------------
......@@ -691,8 +691,11 @@ int vtkXMLDataElement::GetWordTypeAttribute(const char* name, int& value)
#elif VTK_SIZEOF_LONG == 8
value = VTK_LONG;
return 1;
#elif VTK_SIZEOF_ID_TYPE == 8
value = VTK_ID_TYPE;
#elif defined(VTK_TYPE_USE_LONG_LONG) && VTK_SIZEOF_LONG_LONG == 8
value = VTK_LONG_LONG;
return 1;
#elif defined(VTK_TYPE_USE___INT64) && VTK_SIZEOF___INT64 == 8
value = VTK___INT64;
return 1;
#else
vtkErrorMacro("Int64 support not compiled in VTK.");
......@@ -710,6 +713,12 @@ int vtkXMLDataElement::GetWordTypeAttribute(const char* name, int& value)
#elif VTK_SIZEOF_LONG == 8
value = VTK_UNSIGNED_LONG;
return 1;
#elif defined(VTK_TYPE_USE_LONG_LONG) && VTK_SIZEOF_LONG_LONG == 8
value = VTK_UNSIGNED_LONG_LONG;
return 1;
#elif defined(VTK_TYPE_USE___INT64) && defined(VTK_TYPE_CONVERT_UI64_TO_DOUBLE) && VTK_SIZEOF___INT64 == 8
value = VTK_UNSIGNED___INT64;
return 1;
#else
vtkErrorMacro("UInt64 support not compiled in VTK.");
return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment