Commit 00a3657b authored by Brad King's avatar Brad King

ENH: Removing need for VTK_ID_TYPE_IS_NOT_BASIC_TYPE. The test should just be...

ENH: Removing need for VTK_ID_TYPE_IS_NOT_BASIC_TYPE.  The test should just be VTK_USE_64BIT_IDS anyway.
parent a7b04711
......@@ -20,7 +20,7 @@
#include <ctype.h>
vtkCxxRevisionMacro(vtkXMLDataElement, "1.21");
vtkCxxRevisionMacro(vtkXMLDataElement, "1.22");
vtkStandardNewMacro(vtkXMLDataElement);
//----------------------------------------------------------------------------
......@@ -505,7 +505,7 @@ int vtkXMLDataElement::GetScalarAttribute(const char* name,
}
//----------------------------------------------------------------------------
#ifdef VTK_ID_TYPE_IS_NOT_BASIC_TYPE
#ifdef VTK_USE_64BIT_IDS
int vtkXMLDataElement::GetScalarAttribute(const char* name, vtkIdType& value)
{
return this->GetVectorAttribute(name, 1, &value);
......@@ -561,7 +561,7 @@ int vtkXMLDataElement::GetVectorAttribute(const char* name, int length,
}
//----------------------------------------------------------------------------
#ifdef VTK_ID_TYPE_IS_NOT_BASIC_TYPE
#ifdef VTK_USE_64BIT_IDS
int vtkXMLDataElement::GetVectorAttribute(const char* name, int length,
vtkIdType* data)
{
......@@ -765,7 +765,7 @@ void vtkXMLDataElement::SetUnsignedLongAttribute(const char* name,
}
//----------------------------------------------------------------------------
#ifdef VTK_ID_TYPE_IS_NOT_BASIC_TYPE
#ifdef VTK_USE_64BIT_IDS
void vtkXMLDataElement::SetIdTypeAttribute(const char* name,
vtkIdType value)
{
......@@ -821,7 +821,7 @@ void vtkXMLDataElement::SetVectorAttribute(const char* name, int length,
}
//----------------------------------------------------------------------------
#ifdef VTK_ID_TYPE_IS_NOT_BASIC_TYPE
#ifdef VTK_USE_64BIT_IDS
void vtkXMLDataElement::SetVectorAttribute(const char* name, int length,
const vtkIdType* data)
{
......
......@@ -89,7 +89,7 @@ public:
void SetVectorAttribute(const char* name, int length, const double* value);
void SetVectorAttribute(const char* name, int length, const unsigned long* value);
#ifdef VTK_ID_TYPE_IS_NOT_BASIC_TYPE
#ifdef VTK_USE_64BIT_IDS
//BTX
int GetScalarAttribute(const char* name, vtkIdType& value);
void SetIdTypeAttribute(const char* name, vtkIdType value);
......
......@@ -37,7 +37,7 @@
# include <io.h> /* unlink */
#endif
vtkCxxRevisionMacro(vtkXMLWriter, "1.46");
vtkCxxRevisionMacro(vtkXMLWriter, "1.47");
vtkCxxSetObjectMacro(vtkXMLWriter, Compressor, vtkDataCompressor);
//----------------------------------------------------------------------------
......@@ -1157,7 +1157,7 @@ int vtkXMLWriter::WriteScalarAttribute(const char* name, float data)
}
//----------------------------------------------------------------------------
#ifdef VTK_ID_TYPE_IS_NOT_BASIC_TYPE
#ifdef VTK_USE_64BIT_IDS
int vtkXMLWriter::WriteScalarAttribute(const char* name, vtkIdType data)
{
return this->WriteVectorAttribute(name, 1, &data);
......@@ -1210,7 +1210,7 @@ int vtkXMLWriter::WriteVectorAttribute(const char* name, int length,
}
//----------------------------------------------------------------------------
#ifdef VTK_ID_TYPE_IS_NOT_BASIC_TYPE
#ifdef VTK_USE_64BIT_IDS
int vtkXMLWriter::WriteVectorAttribute(const char* name, int length,
vtkIdType* data)
{
......
......@@ -290,14 +290,14 @@ protected:
int WriteScalarAttribute(const char* name, int data);
int WriteScalarAttribute(const char* name, float data);
#ifdef VTK_ID_TYPE_IS_NOT_BASIC_TYPE
#ifdef VTK_USE_64BIT_IDS
int WriteScalarAttribute(const char* name, vtkIdType data);
#endif
int WriteVectorAttribute(const char* name, int length, int* data);
int WriteVectorAttribute(const char* name, int length, float* data);
int WriteVectorAttribute(const char* name, int length, double* data);
#ifdef VTK_ID_TYPE_IS_NOT_BASIC_TYPE
#ifdef VTK_USE_64BIT_IDS
int WriteVectorAttribute(const char* name, int length, vtkIdType* data);
#endif
......
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