diff --git a/CMake/vtkTestTypes.cmake b/CMake/vtkTestTypes.cmake
index 2054c0044c8314ee919d7bda7d15059ad7e49161..62b7635c662ae9f52fd84c551b1dd10637a92946 100644
--- a/CMake/vtkTestTypes.cmake
+++ b/CMake/vtkTestTypes.cmake
@@ -9,74 +9,6 @@ CHECK_TYPE_SIZE(float VTK_SIZEOF_FLOAT)
CHECK_TYPE_SIZE(double VTK_SIZEOF_DOUBLE)
CHECK_TYPE_SIZE("long long" VTK_SIZEOF_LONG_LONG)
-CHECK_TYPE_SIZE("__int64" VTK_SIZEOF___INT64)
-
-IF(VTK_SIZEOF___INT64)
- # In CMake 2.6 and above the type __int64 may have been found only
- # due to inclusion of a system header. Further try-compiles using
- # the type should include the header too.
- SET(_HAVE_DEFS)
- FOREACH(def HAVE_SYS_TYPES_H HAVE_STDINT_H HAVE_STDDEF_H)
- IF(${def})
- LIST(APPEND _HAVE_DEFS -D${def})
- ENDIF()
- ENDFOREACH()
-
- IF(NOT DEFINED VTK_TYPE_SAME_LONG_AND___INT64)
- MESSAGE(STATUS "Checking whether long and __int64 are the same type")
- TRY_COMPILE(VTK_TYPE_SAME_LONG_AND___INT64
- ${VTK_BINARY_DIR}/CMakeTmp
- ${VTK_CMAKE_DIR}/vtkTestCompareTypes.cxx
- COMPILE_DEFINITIONS
- -DVTK_TEST_COMPARE_TYPE_1=long
- -DVTK_TEST_COMPARE_TYPE_2=__int64
- ${_HAVE_DEFS}
- OUTPUT_VARIABLE OUTPUT)
- IF(VTK_TYPE_SAME_LONG_AND___INT64)
- MESSAGE(STATUS "Checking whether long and __int64 are the same type -- yes")
- SET(VTK_TYPE_SAME_LONG_AND___INT64 1 CACHE INTERNAL "Whether long and __int64 are the same type")
- FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log
- "Determining whether long and __int64 are the same type "
- "passed with the following output:\n"
- "${OUTPUT}\n")
- ELSE()
- MESSAGE(STATUS "Checking whether long and __int64 are the same type -- no")
- SET(VTK_TYPE_SAME_LONG_AND___INT64 0 CACHE INTERNAL "Whether long and __int64 are the same type")
- FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
- "Determining whether long and __int64 are the same type "
- "failed with the following output:\n"
- "${OUTPUT}\n")
- ENDIF()
- ENDIF()
- IF(VTK_SIZEOF_LONG_LONG)
- IF(NOT DEFINED VTK_TYPE_SAME_LONG_LONG_AND___INT64)
- MESSAGE(STATUS "Checking whether long long and __int64 are the same type")
- TRY_COMPILE(VTK_TYPE_SAME_LONG_LONG_AND___INT64
- ${VTK_BINARY_DIR}/CMakeTmp
- ${VTK_CMAKE_DIR}/vtkTestCompareTypes.cxx
- COMPILE_DEFINITIONS
- -DVTK_TEST_COMPARE_TYPE_1=TYPE_LONG_LONG
- -DVTK_TEST_COMPARE_TYPE_2=__int64
- ${_HAVE_DEFS}
- OUTPUT_VARIABLE OUTPUT)
- IF(VTK_TYPE_SAME_LONG_LONG_AND___INT64)
- MESSAGE(STATUS "Checking whether long long and __int64 are the same type -- yes")
- SET(VTK_TYPE_SAME_LONG_LONG_AND___INT64 1 CACHE INTERNAL "Whether long long and __int64 are the same type")
- FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log
- "Determining whether long long and __int64 are the same type "
- "passed with the following output:\n"
- "${OUTPUT}\n")
- ELSE()
- MESSAGE(STATUS "Checking whether long long and __int64 are the same type -- no")
- SET(VTK_TYPE_SAME_LONG_LONG_AND___INT64 0 CACHE INTERNAL "Whether long long and __int64 are the same type")
- FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
- "Determining whether long long and __int64 are the same type "
- "failed with the following output:\n"
- "${OUTPUT}\n")
- ENDIF()
- ENDIF()
- ENDIF()
-ENDIF()
# Enable the "long long" type if it is available. It is standard in
# C99 and C++03 but not in earlier standards.
@@ -85,17 +17,6 @@ IF(VTK_SIZEOF_LONG_LONG)
SET(VTK_TYPE_USE_LONG_LONG 1)
ENDIF()
-# Enable the "__int64" type if it is available and unique. It is not
-# standard.
-SET(VTK_TYPE_USE___INT64)
-IF(VTK_SIZEOF___INT64)
- IF(NOT VTK_TYPE_SAME_LONG_AND___INT64)
- IF(NOT VTK_TYPE_SAME_LONG_LONG_AND___INT64)
- SET(VTK_TYPE_USE___INT64 1)
- ENDIF()
- ENDIF()
-ENDIF()
-
IF(NOT DEFINED VTK_TYPE_CHAR_IS_SIGNED)
MESSAGE(STATUS "Checking signedness of char")
TRY_RUN(VTK_TYPE_CHAR_IS_SIGNED VTK_TYPE_CHAR_IS_SIGNED_COMPILED
diff --git a/Common/Core/CMakeLists.txt b/Common/Core/CMakeLists.txt
index a50180e98792ee6efb2ea4e2557fbda7df04924e..f70f17505eb9ab7d5f0b18dc8f651ff73da45183 100644
--- a/Common/Core/CMakeLists.txt
+++ b/Common/Core/CMakeLists.txt
@@ -300,14 +300,6 @@ if(vtkCommonDataModel_ENABLED)
PROPERTY COMPILE_DEFINITIONS vtkCommonDataModel_ENABLED)
endif()
-# __int64 seems to be platform specific, turning on if
-if(HAVE_VTK_SIZEOF__INT64)
- list(APPEND Module_SRCS
- vtkUnsigned__Int64Array.cxx
- vtk__Int64Array.cxx
- )
-endif()
-
if(WIN32)
# TODO: VTK_USE_X was once tested here but is now in another module
list(APPEND Module_SRCS
@@ -410,11 +402,6 @@ if(VTK_TYPE_USE_LONG_LONG)
)
endif()
-if(VTK_TYPE_USE___INT64)
- list(APPEND Module_SRCS vtk__Int64Array.cxx)
- list(APPEND Module_SRCS vtkUnsigned__Int64Array.cxx)
-endif()
-
# Configure data arrays for platform-independent fixed-size types.
# Match the type selection here to that in vtkType.h.
if(VTK_TYPE_CHAR_IS_SIGNED)
@@ -435,11 +422,6 @@ else()
if(VTK_SIZEOF_LONG MATCHES "^8$")
set(VTK_TYPE_NATIVE_Int64 Long)
set(VTK_TYPE_NATIVE_UInt64 UnsignedLong)
- else()
- if(VTK_SIZEOF___INT64 MATCHES "^8$")
- set(VTK_TYPE_NATIVE_Int64 __Int64)
- set(VTK_TYPE_NATIVE_UInt64 Unsigned__Int64)
- endif()
endif()
endif()
set(VTK_TYPE_NATIVE_Float32 Float)
diff --git a/Common/Core/vtkAbstractArray.cxx b/Common/Core/vtkAbstractArray.cxx
index 5da29c598a2b27aef6314d9c00e3d66af60a7315..9d13238e0486f749513ea9d5070f84c7532b8d85 100644
--- a/Common/Core/vtkAbstractArray.cxx
+++ b/Common/Core/vtkAbstractArray.cxx
@@ -47,11 +47,6 @@
# include "vtkUnsignedLongLongArray.h"
#endif
-#if defined(VTK_TYPE_USE___INT64)
-# include "vtk__Int64Array.h"
-# include "vtkUnsigned__Int64Array.h"
-#endif
-
#include <algorithm>
#include <iterator>
#include <set>
@@ -367,14 +362,6 @@ vtkAbstractArray* vtkAbstractArray::CreateArray(int dataType)
return vtkUnsignedLongLongArray::New();
#endif
-#if defined(VTK_TYPE_USE___INT64)
- case VTK___INT64:
- return vtk__Int64Array::New();
-
- case VTK_UNSIGNED___INT64:
- return vtkUnsigned__Int64Array::New();
-#endif
-
case VTK_FLOAT:
return vtkFloatArray::New();
diff --git a/Common/Core/vtkArray.cxx b/Common/Core/vtkArray.cxx
index 4b597e5d540ad06e949ae69b3bb80982ce7647d3..3241b5515f28e5ae5d4423dcf6c2618f71445dd3 100644
--- a/Common/Core/vtkArray.cxx
+++ b/Common/Core/vtkArray.cxx
@@ -94,12 +94,6 @@ vtkArray* vtkArray::CreateArray(int StorageType, int ValueType)
return vtkDenseArray<long long>::New();
case VTK_UNSIGNED_LONG_LONG:
return vtkDenseArray<unsigned long long>::New();
-#endif
-#if defined(VTK_TYPE_USE___INT64)
- case VTK___INT64:
- return vtkDenseArray<__int64>::New();
- case VTK_UNSIGNED___INT64:
- return vtkDenseArray<unsigned __int64>::New();
#endif
case VTK_FLOAT:
return vtkDenseArray<float>::New();
@@ -144,12 +138,6 @@ vtkArray* vtkArray::CreateArray(int StorageType, int ValueType)
return vtkSparseArray<long long>::New();
case VTK_UNSIGNED_LONG_LONG:
return vtkSparseArray<unsigned long long>::New();
-#endif
-#if defined(VTK_TYPE_USE___INT64)
- case VTK___INT64:
- return vtkSparseArray<__int64>::New();
- case VTK_UNSIGNED___INT64:
- return vtkSparseArray<unsigned __int64>::New();
#endif
case VTK_FLOAT:
return vtkSparseArray<float>::New();
diff --git a/Common/Core/vtkByteSwap.cxx b/Common/Core/vtkByteSwap.cxx
index 73a9264ce005df803fa88ee0412996732cff692e..d501c9a9f115d7c1f5aaed52e2d25f1fa2808d22 100644
--- a/Common/Core/vtkByteSwap.cxx
+++ b/Common/Core/vtkByteSwap.cxx
@@ -249,10 +249,6 @@ VTK_BYTE_SWAP_IMPL(unsigned long)
VTK_BYTE_SWAP_IMPL(long long)
VTK_BYTE_SWAP_IMPL(unsigned long long)
#endif
-#if defined(VTK_TYPE_USE___INT64)
-VTK_BYTE_SWAP_IMPL(__int64)
-VTK_BYTE_SWAP_IMPL(unsigned __int64)
-#endif
#undef VTK_BYTE_SWAP_IMPL
#if VTK_SIZEOF_SHORT == 2
diff --git a/Common/Core/vtkByteSwap.h b/Common/Core/vtkByteSwap.h
index c42b55a4fc6bbb6590d9a416126245d7dfe1a076..77e2be139115170c9a156a186157d619f274a93c 100644
--- a/Common/Core/vtkByteSwap.h
+++ b/Common/Core/vtkByteSwap.h
@@ -58,10 +58,6 @@ public:
VTK_BYTE_SWAP_DECL(long long);
VTK_BYTE_SWAP_DECL(unsigned long long);
#endif
-#if defined(VTK_TYPE_USE___INT64)
- VTK_BYTE_SWAP_DECL(__int64);
- VTK_BYTE_SWAP_DECL(unsigned __int64);
-#endif
#undef VTK_BYTE_SWAP_DECL
//ETX
diff --git a/Common/Core/vtkConfigure.h.in b/Common/Core/vtkConfigure.h.in
index e22ababde3dc8ba1bd04f13b564265aa21109dbb..902325767dbd8ac3a378febaa15ade5e1cd53a6f 100644
--- a/Common/Core/vtkConfigure.h.in
+++ b/Common/Core/vtkConfigure.h.in
@@ -85,16 +85,9 @@
#else
#cmakedefine VTK_SIZEOF_LONG_LONG 8
#endif
-#cmakedefine VTK_SIZEOF___INT64 @VTK_SIZEOF___INT64@
-/* Whether types "long long" and "__int64" are enabled. If a type is
- enabled then it is a unique fundamental type. */
+/* Whether type "long long" is enabled as a unique fundamental type. */
#cmakedefine VTK_TYPE_USE_LONG_LONG
-#cmakedefine VTK_TYPE_USE___INT64
-
-/* Some properties of the available types. */
-#cmakedefine VTK_TYPE_SAME_LONG_AND___INT64
-#cmakedefine VTK_TYPE_SAME_LONG_LONG_AND___INT64
/* Whether type "char" is signed (it may be signed or unsigned). */
#define VTK_TYPE_CHAR_IS_SIGNED @VTK_TYPE_CHAR_IS_SIGNED@
diff --git a/Common/Core/vtkDataArray.cxx b/Common/Core/vtkDataArray.cxx
index 83c55a15f58bd25d617c9c5477e3ed82a780c9e2..934d0d5413a601e9eef82df97aa9dc801462c360 100644
--- a/Common/Core/vtkDataArray.cxx
+++ b/Common/Core/vtkDataArray.cxx
@@ -1261,10 +1261,6 @@ double vtkDataArray::GetDataTypeMin(int type)
#if defined(VTK_TYPE_USE_LONG_LONG)
case VTK_UNSIGNED_LONG_LONG: return static_cast<double>(VTK_UNSIGNED_LONG_LONG_MIN);
case VTK_LONG_LONG: return static_cast<double>(VTK_LONG_LONG_MIN);
-#endif
-#if defined(VTK_TYPE_USE___INT64)
- case VTK___INT64: return static_cast<double>(VTK___INT64_MIN);
- case VTK_UNSIGNED___INT64: return static_cast<double>(VTK_UNSIGNED___INT64_MIN);
#endif
case VTK_FLOAT: return static_cast<double>(VTK_FLOAT_MIN);
case VTK_DOUBLE: return static_cast<double>(VTK_DOUBLE_MIN);
@@ -1291,10 +1287,6 @@ double vtkDataArray::GetDataTypeMax(int type)
#if defined(VTK_TYPE_USE_LONG_LONG)
case VTK_UNSIGNED_LONG_LONG: return static_cast<double>(VTK_UNSIGNED_LONG_LONG_MAX);
case VTK_LONG_LONG: return static_cast<double>(VTK_LONG_LONG_MAX);
-#endif
-#if defined(VTK_TYPE_USE___INT64)
- case VTK___INT64: return static_cast<double>(VTK___INT64_MAX);
- case VTK_UNSIGNED___INT64: return static_cast<double>(VTK_UNSIGNED___INT64_MAX);
#endif
case VTK_FLOAT: return static_cast<double>(VTK_FLOAT_MAX);
case VTK_DOUBLE: return static_cast<double>(VTK_DOUBLE_MAX);
diff --git a/Common/Core/vtkLargeInteger.cxx b/Common/Core/vtkLargeInteger.cxx
index 017fb9f07b0ccbb2f18dbf90a806607ba8d0451a..2412e8a1c737c399a9a86c7b336f0c0b8a06668e 100644
--- a/Common/Core/vtkLargeInteger.cxx
+++ b/Common/Core/vtkLargeInteger.cxx
@@ -82,37 +82,6 @@ vtkLargeInteger::vtkLargeInteger(unsigned long long n)
}
#endif
-#if defined(VTK_TYPE_USE___INT64)
-vtkLargeInteger::vtkLargeInteger(__int64 n)
-{
- this->Negative = n < 0 ? 1 : 0;
- n = n < 0 ? -n : n; // strip of sign
- this->Number = new char[BIT_INCREMENT];
- for (unsigned int i = 0; i < BIT_INCREMENT; i++)
- {
- this->Number[i] = n & 1;
- n >>= 1;
- }
- this->Max = BIT_INCREMENT - 1;
- this->Sig = BIT_INCREMENT - 1;
- this->Contract(); // remove leading 0s
-}
-
-vtkLargeInteger::vtkLargeInteger(unsigned __int64 n)
-{
- this->Negative = 0;
- this->Number = new char[BIT_INCREMENT];
- for (unsigned int i = 0; i < BIT_INCREMENT; i++)
- {
- this->Number[i] = n & 1;
- n >>= 1;
- }
- this->Max = BIT_INCREMENT - 1;
- this->Sig = BIT_INCREMENT - 1;
- this->Contract(); // remove leading 0s
-}
-#endif
-
vtkLargeInteger::vtkLargeInteger(long n)
{
this->Negative = n < 0 ? 1 : 0;
diff --git a/Common/Core/vtkLargeInteger.h b/Common/Core/vtkLargeInteger.h
index 680fcf74c02012ec7f1e5f6d6949bed2889b328c..5d98b1916ea46a6c7cb0be51799b070181819700 100644
--- a/Common/Core/vtkLargeInteger.h
+++ b/Common/Core/vtkLargeInteger.h
@@ -33,10 +33,6 @@ public:
vtkLargeInteger(long long n);
vtkLargeInteger(unsigned long long n);
#endif
-#if defined(VTK_TYPE_USE___INT64)
- vtkLargeInteger(__int64 n);
- vtkLargeInteger(unsigned __int64 n);
-#endif
~vtkLargeInteger(void);
diff --git a/Common/Core/vtkMath.cxx b/Common/Core/vtkMath.cxx
index 6a8024f5006515721d4163edf625d6a30efddc20..606fdbd2f8a50ed0b4201581dd79493cdc2400e5 100644
--- a/Common/Core/vtkMath.cxx
+++ b/Common/Core/vtkMath.cxx
@@ -2860,16 +2860,6 @@ int vtkMath::GetScalarTypeFittingRange(
{ VTK_UNSIGNED_LONG_LONG,
static_cast<double>(VTK_UNSIGNED_LONG_LONG_MIN),
static_cast<double>(VTK_UNSIGNED_LONG_LONG_MAX) }
-#endif
-#if defined(VTK_TYPE_USE___INT64)
- ,
- { VTK___INT64,
- static_cast<double>(VTK___INT64_MIN),
- static_cast<double>(VTK___INT64_MAX) }
- ,
- { VTK_UNSIGNED___INT64,
- static_cast<double>(VTK_UNSIGNED___INT64_MIN),
- static_cast<double>(VTK_UNSIGNED___INT64_MAX) }
#endif
};
diff --git a/Common/Core/vtkOStreamWrapper.cxx b/Common/Core/vtkOStreamWrapper.cxx
index c7e98c2f757d1ed2c8064a5c54f07898270b0e47..fac0e17f5230a08e3339b01e59e962a856e22ba6 100644
--- a/Common/Core/vtkOStreamWrapper.cxx
+++ b/Common/Core/vtkOStreamWrapper.cxx
@@ -76,10 +76,6 @@ VTKOSTREAM_OPERATOR(bool);
VTKOSTREAM_OPERATOR(long long);
VTKOSTREAM_OPERATOR(unsigned long long);
#endif
-#if defined(VTK_TYPE_USE___INT64)
-VTKOSTREAM_OPERATOR(__int64);
-VTKOSTREAM_OPERATOR(unsigned __int64);
-#endif
VTKOSTREAM_OPERATOR_FUNC(void (*a)(void*));
VTKOSTREAM_OPERATOR_FUNC(void* (*a)(void*));
VTKOSTREAM_OPERATOR_FUNC(int (*a)(void*));
diff --git a/Common/Core/vtkOStreamWrapper.h b/Common/Core/vtkOStreamWrapper.h
index 2a9625f756d2e45555cfc4d3f0dfa35a04a70fa7..5dabbc79d705aaf3c7e887f0b7a59640c9217c7d 100644
--- a/Common/Core/vtkOStreamWrapper.h
+++ b/Common/Core/vtkOStreamWrapper.h
@@ -81,10 +81,6 @@ public:
#if defined(VTK_TYPE_USE_LONG_LONG)
vtkOStreamWrapper& operator << (long long);
vtkOStreamWrapper& operator << (unsigned long long);
-#endif
-#if defined(VTK_TYPE_USE___INT64)
- vtkOStreamWrapper& operator << (__int64);
- vtkOStreamWrapper& operator << (unsigned __int64);
#endif
vtkOStreamWrapper& operator << (bool);
diff --git a/Common/Core/vtkSetGet.h b/Common/Core/vtkSetGet.h
index 2c4c1f0ecfc6c96611b7aee44b826655523ddd8e..e4260a6a0b884735ef6d8c46319c1f0d7ec5377d 100644
--- a/Common/Core/vtkSetGet.h
+++ b/Common/Core/vtkSetGet.h
@@ -674,8 +674,6 @@ virtual double *Get##name() \
vtkTemplateMacroCase(VTK_FLOAT, float, call); \
vtkTemplateMacroCase_ll(VTK_LONG_LONG, long long, call) \
vtkTemplateMacroCase_ll(VTK_UNSIGNED_LONG_LONG, unsigned long long, call) \
- vtkTemplateMacroCase_si64(VTK___INT64, __int64, call) \
- vtkTemplateMacroCase_ui64(VTK_UNSIGNED___INT64, unsigned __int64, call) \
vtkTemplateMacroCase(VTK_ID_TYPE, vtkIdType, call); \
vtkTemplateMacroCase(VTK_LONG, long, call); \
vtkTemplateMacroCase(VTK_UNSIGNED_LONG, unsigned long, call); \
@@ -708,8 +706,6 @@ virtual double *Get##name() \
vtkTemplate2MacroCase1(VTK_FLOAT, float, call); \
vtkTemplate2MacroCase1_ll(VTK_LONG_LONG, long long, call) \
vtkTemplate2MacroCase1_ll(VTK_UNSIGNED_LONG_LONG, unsigned long long, call) \
- vtkTemplate2MacroCase1_si64(VTK___INT64, __int64, call) \
- vtkTemplate2MacroCase1_ui64(VTK_UNSIGNED___INT64, unsigned __int64, call) \
vtkTemplate2MacroCase1(VTK_ID_TYPE, vtkIdType, call); \
vtkTemplate2MacroCase1(VTK_LONG, long, call); \
vtkTemplate2MacroCase1(VTK_UNSIGNED_LONG, unsigned long, call); \
@@ -725,8 +721,6 @@ virtual double *Get##name() \
vtkTemplate2MacroCase2(type1N, type1, VTK_FLOAT, float, call); \
vtkTemplate2MacroCase2_ll(type1N, type1, VTK_LONG_LONG, long long, call) \
vtkTemplate2MacroCase2_ll(type1N, type1, VTK_UNSIGNED_LONG_LONG, unsigned long long, call) \
- vtkTemplate2MacroCase2_si64(type1N, type1, VTK___INT64, __int64, call) \
- vtkTemplate2MacroCase2_ui64(type1N, type1, VTK_UNSIGNED___INT64, unsigned __int64, call) \
vtkTemplate2MacroCase2(type1N, type1, VTK_ID_TYPE, vtkIdType, call); \
vtkTemplate2MacroCase2(type1N, type1, VTK_LONG, long, call); \
vtkTemplate2MacroCase2(type1N, type1, VTK_UNSIGNED_LONG, unsigned long, call); \
@@ -774,8 +768,6 @@ virtual double *Get##name() \
vtkArrayIteratorTemplateMacroCase(VTK_FLOAT, float, call); \
vtkArrayIteratorTemplateMacroCase_ll(VTK_LONG_LONG, long long, call); \
vtkArrayIteratorTemplateMacroCase_ll(VTK_UNSIGNED_LONG_LONG, unsigned long long, call);\
- vtkArrayIteratorTemplateMacroCase_si64(VTK___INT64, __int64, call); \
- vtkArrayIteratorTemplateMacroCase_ui64(VTK_UNSIGNED___INT64, unsigned __int64, call); \
vtkArrayIteratorTemplateMacroCase(VTK_ID_TYPE, vtkIdType, call); \
vtkArrayIteratorTemplateMacroCase(VTK_LONG, long, call); \
vtkArrayIteratorTemplateMacroCase(VTK_UNSIGNED_LONG, unsigned long, call); \
@@ -806,40 +798,6 @@ virtual double *Get##name() \
# define vtkArrayIteratorTemplateMacroCase_ll(typeN, type, call)
#endif
-// Add "__int64" to the template macro if it is enabled.
-#if defined(VTK_TYPE_USE___INT64)
-# define vtkTemplateMacroCase_si64(typeN, type, call) \
- vtkTemplateMacroCase(typeN, type, call);
-# define vtkTemplate2MacroCase1_si64(type1N, type1, call) \
- vtkTemplate2MacroCase1(type1N, type1, call);
-# define vtkTemplate2MacroCase2_si64(type1N, type1, type2N, type2, call) \
- vtkTemplate2MacroCase2(type1N, type1, type2N, type2, call);
-# define vtkArrayIteratorTemplateMacroCase_si64(typeN, type, call) \
- vtkArrayIteratorTemplateMacroCase(typeN, type, call)
-#else
-# define vtkTemplateMacroCase_si64(typeN, type, call)
-# define vtkTemplate2MacroCase1_si64(type1N, type1, call)
-# define vtkTemplate2MacroCase2_si64(type1N, type1, type2N, type2, call)
-# define vtkArrayIteratorTemplateMacroCase_si64(typeN, type, call)
-#endif
-
-// Add "unsigned __int64" to the template macro if it is enabled.
-#if defined(VTK_TYPE_USE___INT64)
-# define vtkTemplateMacroCase_ui64(typeN, type, call) \
- vtkTemplateMacroCase(typeN, type, call);
-# define vtkTemplate2MacroCase1_ui64(type1N, type1, call) \
- vtkTemplate2MacroCase1(type1N, type1, call);
-# define vtkTemplate2MacroCase2_ui64(type1N, type1, type2N, type2, call) \
- vtkTemplate2MacroCase2(type1N, type1, type2N, type2, call);
-# define vtkArrayIteratorTemplateMacroCase_ui64(typeN, type, call) \
- vtkArrayIteratorTemplateMacroCase(typeN, type, call);
-#else
-# define vtkTemplateMacroCase_ui64(typeN, type, call)
-# define vtkTemplate2MacroCase1_ui64(type1N, type1, call)
-# define vtkTemplate2MacroCase2_ui64(type1N, type1, type2N, type2, call)
-# define vtkArrayIteratorTemplateMacroCase_ui64(typeN, type, call)
-#endif
-
//----------------------------------------------------------------------------
// Setup legacy code policy.
diff --git a/Common/Core/vtkSortDataArray.cxx b/Common/Core/vtkSortDataArray.cxx
index 068d7deb86cf2b4d2dbc004950dab6c9b64f5d55..4dab4016bdec4f966d184de3cdb097eecd749197 100644
--- a/Common/Core/vtkSortDataArray.cxx
+++ b/Common/Core/vtkSortDataArray.cxx
@@ -304,20 +304,6 @@ static int vtkSortDataArrayComponentCompare_VTK_UNSIGNED_LONG_LONG( const void*
}
#endif // VTK_TYPE_USE_LONG_LONG
-#ifdef VTK_TYPE_USE___INT64
-static int vtkSortDataArrayComponentCompare_VTK___INT64( const void* a, const void* b )
-{
- return ((vtkTypeInt64*)a)[vtkSortDataArrayComp] < ((vtkTypeInt64*)b)[vtkSortDataArrayComp] ? -1 :
- (((vtkTypeInt64*)a)[vtkSortDataArrayComp] == ((vtkTypeInt64*)b)[vtkSortDataArrayComp] ? 0 : 1);
-}
-
-static int vtkSortDataArrayComponentCompare_VTK_UNSIGNED___INT64( const void* a, const void* b )
-{
- return ((vtkTypeUInt64*)a)[vtkSortDataArrayComp] < ((vtkTypeUInt64*)b)[vtkSortDataArrayComp] ? -1 :
- (((vtkTypeUInt64*)a)[vtkSortDataArrayComp] == ((vtkTypeUInt64*)b)[vtkSortDataArrayComp] ? 0 : 1);
-}
-#endif // VTK_TYPE_USE___INT64
-
static int vtkSortDataArrayComponentCompare_VTK_ID_TYPE( const void* a, const void* b )
{
return ((vtkIdType*)a)[vtkSortDataArrayComp] < ((vtkIdType*)b)[vtkSortDataArrayComp] ? -1 :
@@ -459,20 +445,6 @@ void vtkSortDataArray::SortArrayByComponent( vtkAbstractArray* arr, int k )
vtkSortDataArrayComponentCompare_VTK_UNSIGNED_LONG_LONG);
break;
#endif // VTK_TYPE_USE_LONG_LONG
-#ifdef VTK_TYPE_USE___INT64
- case VTK___INT64:
- qsort(static_cast<void*>(arr->GetVoidPointer(0)),
- static_cast<size_t>(arr->GetNumberOfTuples()),
- static_cast<size_t>(arr->GetDataTypeSize()*nc),
- vtkSortDataArrayComponentCompare_VTK___INT64);
- break;
- case VTK_UNSIGNED___INT64:
- qsort(static_cast<void*>(arr->GetVoidPointer(0)),
- static_cast<size_t>(arr->GetNumberOfTuples()),
- static_cast<size_t>(arr->GetDataTypeSize()*nc),
- vtkSortDataArrayComponentCompare_VTK_UNSIGNED___INT64);
- break;
-#endif // VTK_TYPE_USE___INT64
case VTK_ID_TYPE:
qsort(static_cast<void*>(arr->GetVoidPointer(0)),
static_cast<size_t>(arr->GetNumberOfTuples()),
diff --git a/Common/Core/vtkTemplateAliasMacro.h b/Common/Core/vtkTemplateAliasMacro.h
index aee8bc163e42f38e141468bc81e3a6fe3beb757a..bcc67c30b01d494c4232e098cd35b16c51ed7905 100644
--- a/Common/Core/vtkTemplateAliasMacro.h
+++ b/Common/Core/vtkTemplateAliasMacro.h
@@ -83,14 +83,6 @@
# define vtkTemplateAliasMacroCase_ll(typeN, call)
#endif
-// Add "__int64" to the template macro if it is enabled.
-#if defined(VTK_TYPE_USE___INT64)
-# define vtkTemplateAliasMacroCase_i64(typeN, call) \
- vtkTemplateAliasMacroCase(typeN, call);
-#else
-# define vtkTemplateAliasMacroCase_i64(typeN, call)
-#endif
-
// Define a macro to dispatch calls to a template instantiated over
// the aliased scalar types.
#define vtkTemplateAliasMacro(call) \
@@ -98,8 +90,6 @@
vtkTemplateAliasMacroCase(FLOAT, call); \
vtkTemplateAliasMacroCase_ll(LONG_LONG, call) \
vtkTemplateAliasMacroCase_ll(UNSIGNED_LONG_LONG, call) \
- vtkTemplateAliasMacroCase_i64(__INT64, call) \
- vtkTemplateAliasMacroCase_i64(UNSIGNED___INT64, call) \
vtkTemplateAliasMacroCase(ID_TYPE, call); \
vtkTemplateAliasMacroCase(LONG, call); \
vtkTemplateAliasMacroCase(UNSIGNED_LONG, call); \
diff --git a/Common/Core/vtkType.h b/Common/Core/vtkType.h
index 8d0fcf208475b7706e28de3ef7e85e8295f69ee1..a096b6cf487218f275ba61b0dbfd5c2a76a0d3d1 100644
--- a/Common/Core/vtkType.h
+++ b/Common/Core/vtkType.h
@@ -45,10 +45,10 @@
#define VTK_LONG_LONG 16
#define VTK_UNSIGNED_LONG_LONG 17
-/* This type is enabled if VTK_TYPE_USE___INT64 is defined. */
+/* Legacy. This type is never enabled. */
#define VTK___INT64 18
-/* This type is enabled if VTK_TYPE_USE___INT64 is defined. */
+/* Legacy. This type is never enabled. */
#define VTK_UNSIGNED___INT64 19
/* These types are required by vtkVariant and vtkVariantArray */
@@ -145,24 +145,6 @@
# define VTK_UNSIGNED_LONG_LONG_MIN VTK_TYPE_CAST(unsigned long long, 0ull)
# define VTK_UNSIGNED_LONG_LONG_MAX VTK_TYPE_CAST(unsigned long long, ~0ull)
#endif
-#if defined(VTK_SIZEOF___INT64)
-# if defined(VTK_TYPE_SAME_LONG_AND___INT64)
-# define VTK___INT64_MIN VTK_TYPE_CAST(__int64, ~(~0ul >> 1))
-# define VTK___INT64_MAX VTK_TYPE_CAST(__int64, ~0ul >> 1)
-# define VTK_UNSIGNED___INT64_MIN VTK_TYPE_CAST(unsigned __int64, 0ul)
-# define VTK_UNSIGNED___INT64_MAX VTK_TYPE_CAST(unsigned __int64, ~0ul)
-# elif defined(VTK_TYPE_SAME_LONG_LONG_AND___INT64)
-# define VTK___INT64_MIN VTK_TYPE_CAST(__int64, ~(~0ull >> 1))
-# define VTK___INT64_MAX VTK_TYPE_CAST(__int64, ~0ull >> 1)
-# define VTK_UNSIGNED___INT64_MIN VTK_TYPE_CAST(unsigned __int64, 0ull)
-# define VTK_UNSIGNED___INT64_MAX VTK_TYPE_CAST(unsigned __int64, ~0ull)
-# else
-# define VTK___INT64_MIN VTK_TYPE_CAST(__int64, ~(~0ui64 >> 1))
-# define VTK___INT64_MAX VTK_TYPE_CAST(__int64, ~0ui64 >> 1)
-# define VTK_UNSIGNED___INT64_MIN VTK_TYPE_CAST(unsigned __int64, 0ui64)
-# define VTK_UNSIGNED___INT64_MAX VTK_TYPE_CAST(unsigned __int64, ~0ui64)
-# endif
-#endif
/*--------------------------------------------------------------------------*/
/* Define named types and constants corresponding to specific integer
@@ -223,11 +205,6 @@ typedef unsigned long vtkTypeUInt64;
typedef signed long vtkTypeInt64;
# define VTK_TYPE_UINT64 VTK_UNSIGNED_LONG
# define VTK_TYPE_INT64 VTK_LONG
-#elif defined(VTK_TYPE_USE___INT64) && VTK_SIZEOF___INT64 == 8
-typedef unsigned __int64 vtkTypeUInt64;
-typedef signed __int64 vtkTypeInt64;
-# define VTK_TYPE_UINT64 VTK_UNSIGNED___INT64
-# define VTK_TYPE_INT64 VTK___INT64
#else
# error "No native data type can represent a 64-bit integer."
#endif
@@ -264,12 +241,6 @@ typedef long vtkIdType;
# define VTK_SIZEOF_ID_TYPE VTK_SIZEOF_LONG
# define VTK_ID_MIN VTK_LONG_MIN
# define VTK_ID_MAX VTK_LONG_MAX
-# elif defined(VTK_TYPE_USE___INT64) && VTK_SIZEOF___INT64 == 8
-typedef __int64 vtkIdType;
-# define VTK_ID_TYPE_IMPL VTK___INT64
-# define VTK_SIZEOF_ID_TYPE VTK_SIZEOF___INT64
-# define VTK_ID_MIN VTK___INT64_MIN
-# define VTK_ID_MAX VTK___INT64_MAX
# else
# error "VTK_USE_64BIT_IDS is ON but no 64-bit integer type is available."
# endif
diff --git a/Common/Core/vtkTypeTraits.h b/Common/Core/vtkTypeTraits.h
index dbd33938aa34eefe81d6321af80d1b2b8a3595b9..06806cf60fd67d2145877f5149af6956d01aa449 100644
--- a/Common/Core/vtkTypeTraits.h
+++ b/Common/Core/vtkTypeTraits.h
@@ -137,21 +137,6 @@ VTK_TYPE_TRAITS(unsigned long long, UNSIGNED_LONG_LONG, 0, UInt64,
# endif
#endif
-// Define traits for __int64 types if they are enabled.
-#if defined(VTK_TYPE_USE___INT64)
-# define VTK_TYPE_NAME___INT64 __int64
-# define VTK_TYPE_NAME_UNSIGNED___INT64 unsigned __int64
-# if VTK_SIZEOF___INT64 == 8
-# define VTK_TYPE_SIZED___INT64 INT64
-# define VTK_TYPE_SIZED_UNSIGNED___INT64 UINT64
-VTK_TYPE_TRAITS(__int64, __INT64, 1, Int64, __int64, "%I64d");
-VTK_TYPE_TRAITS(unsigned __int64, UNSIGNED___INT64, 0, UInt64,
- unsigned __int64, "%I64u");
-# else
-# error "Type __int64 is not 8 bytes in size."
-# endif
-#endif
-
// Define traits for vtkIdType. The template specialization is
// already defined for the corresponding native type.
#define VTK_TYPE_NAME_ID_TYPE vtkIdType
diff --git a/Common/Core/vtkUnsigned__Int64Array.cxx b/Common/Core/vtkUnsigned__Int64Array.cxx
deleted file mode 100644
index d57ba0da38b296d14891dc069ee29e23163f79dd..0000000000000000000000000000000000000000
--- a/Common/Core/vtkUnsigned__Int64Array.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*=========================================================================
-
- Program: Visualization Toolkit
- Module: vtkUnsigned__Int64Array.cxx
-
- Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
- All rights reserved.
- See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notice for more information.
-
-=========================================================================*/
-// Instantiate superclass first to give the template a DLL interface.
-#include "vtkDataArrayTemplate.txx"
-VTK_DATA_ARRAY_TEMPLATE_INSTANTIATE(unsigned __int64);
-#include "vtkArrayIteratorTemplate.txx"
-VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(unsigned __int64);
-
-#define vtkUnsigned__Int64Array_cxx
-#include "vtkUnsigned__Int64Array.h"
-
-#include "vtkObjectFactory.h"
-
-//----------------------------------------------------------------------------
-vtkStandardNewMacro(vtkUnsigned__Int64Array);
-
-//----------------------------------------------------------------------------
-vtkUnsigned__Int64Array::vtkUnsigned__Int64Array(vtkIdType numComp):
- RealSuperclass(numComp)
-{
-}
-
-//----------------------------------------------------------------------------
-vtkUnsigned__Int64Array::~vtkUnsigned__Int64Array()
-{
-}
-
-//----------------------------------------------------------------------------
-void vtkUnsigned__Int64Array::PrintSelf(ostream& os, vtkIndent indent)
-{
- this->RealSuperclass::PrintSelf(os,indent);
-}
diff --git a/Common/Core/vtkUnsigned__Int64Array.h b/Common/Core/vtkUnsigned__Int64Array.h
deleted file mode 100644
index a8dc590a72dc664e4c324562429747ec7250c4a0..0000000000000000000000000000000000000000
--- a/Common/Core/vtkUnsigned__Int64Array.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*=========================================================================
-
- Program: Visualization Toolkit
- Module: vtkUnsigned__Int64Array.h
-
- Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
- All rights reserved.
- See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notice for more information.
-
-=========================================================================*/
-// .NAME vtkUnsigned__Int64Array - dynamic, self-adjusting array of unsigned __int64
-// .SECTION Description
-// vtkUnsigned__Int64Array is an array of values of type unsigned __int64.
-// It provides methods for insertion and retrieval of values and will
-// automatically resize itself to hold new data.
-//
-// This class is intended to give an array of unsigned 64 bit integers
-// on systems where unsigned __int64 is the only unsigned 64 bit integer
-// type. If an array of unsigned 64 bit
-// integers is needed, prefer vtkTypeUInt64Array, which will always uses
-// the system's most appropriate datatype for unsigned 64 bit integers.
-
-#ifndef vtkUnsigned__Int64Array_h
-#define vtkUnsigned__Int64Array_h
-
-// Tell the template header how to give our superclass a DLL interface.
-#if !defined(vtkUnsigned__Int64Array_cxx)
-# define VTK_DATA_ARRAY_TEMPLATE_TYPE unsigned __int64
-#endif
-
-#include "vtkCommonCoreModule.h" // For export macro
-#include "vtkDataArray.h"
-#include "vtkDataArrayTemplate.h" // Real Superclass
-
-// Fake the superclass for the wrappers.
-#ifndef __WRAP__
-#define vtkDataArray vtkDataArrayTemplate<unsigned __int64>
-#endif
-class VTKCOMMONCORE_EXPORT vtkUnsigned__Int64Array : public vtkDataArray
-#ifndef __WRAP__
-#undef vtkDataArray
-#endif
-{
-public:
- static vtkUnsigned__Int64Array* New();
- vtkTypeMacro(vtkUnsigned__Int64Array,vtkDataArray);
- void PrintSelf(ostream& os, vtkIndent indent);
-
- // This macro expands to the set of method declarations that
- // make up the interface of vtkDataArrayTemplate, which is ignored
- // by the wrappers.
-#if defined(__WRAP__) || defined (__WRAP_GCCXML__)
- vtkCreateWrappedArrayInterface(unsigned __int64);
-#endif
-
- // Description:
- // Get the minimum data value in its native type.
- static unsigned __int64 GetDataTypeValueMin() { return VTK_UNSIGNED___INT64_MIN; }
-
- // Description:
- // Get the maximum data value in its native type.
- static unsigned __int64 GetDataTypeValueMax() { return VTK_UNSIGNED___INT64_MAX; }
-
-protected:
- vtkUnsigned__Int64Array(vtkIdType numComp=1);
- ~vtkUnsigned__Int64Array();
-
-private:
- //BTX
- typedef vtkDataArrayTemplate<unsigned __int64> RealSuperclass;
- //ETX
- vtkUnsigned__Int64Array(const vtkUnsigned__Int64Array&); // Not implemented.
- void operator=(const vtkUnsigned__Int64Array&); // Not implemented.
-};
-
-#endif
diff --git a/Common/Core/vtkVariant.cxx b/Common/Core/vtkVariant.cxx
index 8856e9dd55f241cce888feb54dae50980fa1f131..826c5e0ef1cf4d70c1240d880d1cfde1f81f0305 100644
--- a/Common/Core/vtkVariant.cxx
+++ b/Common/Core/vtkVariant.cxx
@@ -103,14 +103,6 @@ bool vtkVariantStrictWeakOrder::operator()(const vtkVariant& s1, const vtkVarian
case VTK_UNSIGNED_LONG:
return (s1.Data.UnsignedLong < s2.Data.UnsignedLong);
-#if defined(VTK_TYPE_USE___INT64)
- case VTK___INT64:
- return (s1.Data.__Int64 < s2.Data.__Int64);
-
- case VTK_UNSIGNED___INT64:
- return (s1.Data.Unsigned__Int64 < s2.Data.Unsigned__Int64);
-#endif
-
#if defined(VTK_TYPE_USE_LONG_LONG)
case VTK_LONG_LONG:
return (s1.Data.LongLong < s2.Data.LongLong);
@@ -197,14 +189,6 @@ vtkVariantStrictEquality::operator()(const vtkVariant &s1, const vtkVariant &s2)
case VTK_UNSIGNED_LONG:
return (s1.Data.UnsignedLong == s2.Data.UnsignedLong);
-#if defined(VTK_TYPE_USE___INT64)
- case VTK___INT64:
- return (s1.Data.__Int64 == s2.Data.__Int64);
-
- case VTK_UNSIGNED___INT64:
- return (s1.Data.Unsigned__Int64 == s2.Data.Unsigned__Int64);
-#endif
-
#if defined(VTK_TYPE_USE_LONG_LONG)
case VTK_LONG_LONG:
return (s1.Data.LongLong == s2.Data.LongLong);
@@ -334,16 +318,6 @@ vtkVariant::vtkVariant(const vtkVariant &s2, unsigned int type)
this->Data.UnsignedLong = s2.ToUnsignedLong(&valid);
break;
-#if defined(VTK_TYPE_USE___INT64)
- case VTK___INT64:
- this->Data.__Int64 = s2.To__Int64(&valid);
- break;
-
- case VTK_UNSIGNED___INT64:
- this->Data.Unsigned__Int64 = s2.ToUnsigned__Int64(&valid);
- break;
-#endif
-
#if defined(VTK_TYPE_USE_LONG_LONG)
case VTK_LONG_LONG:
this->Data.LongLong = s2.ToLongLong(&valid);
@@ -504,21 +478,6 @@ vtkVariant::vtkVariant(unsigned long value)
this->Type = VTK_UNSIGNED_LONG;
}
-#if defined(VTK_TYPE_USE___INT64)
-vtkVariant::vtkVariant(__int64 value)
-{
- this->Data.__Int64 = value;
- this->Valid = 1;
- this->Type = VTK___INT64;
-}
-
-vtkVariant::vtkVariant(unsigned __int64 value)
-{
- this->Data.Unsigned__Int64 = value;
- this->Valid = 1;
- this->Type = VTK_UNSIGNED___INT64;
-}
-#endif
#if defined(VTK_TYPE_USE_LONG_LONG)
vtkVariant::vtkVariant(long long value)
{
@@ -616,8 +575,6 @@ bool vtkVariant::IsNumeric() const
|| this->IsUnsignedInt()
|| this->IsLong()
|| this->IsUnsignedLong()
- || this->Is__Int64()
- || this->IsUnsigned__Int64()
|| this->IsLongLong()
|| this->IsUnsignedLongLong();
}
@@ -679,12 +636,12 @@ bool vtkVariant::IsUnsignedLong() const
bool vtkVariant::Is__Int64() const
{
- return this->Type == VTK___INT64;
+ return false;
}
bool vtkVariant::IsUnsigned__Int64() const
{
- return this->Type == VTK_UNSIGNED___INT64;
+ return false;
}
bool vtkVariant::IsLongLong() const
@@ -825,22 +782,6 @@ vtkStdString vtkVariant::ToString() const
ostr << this->Data.UnsignedLong;
return vtkStdString(ostr.str());
}
-#if defined(VTK_TYPE_USE___INT64)
- if (this->Is__Int64())
- {
- std::ostringstream ostr;
- ostr.imbue(std::locale::classic());
- ostr << this->Data.__Int64;
- return vtkStdString(ostr.str());
- }
- if (this->IsUnsigned__Int64())
- {
- std::ostringstream ostr;
- ostr.imbue(std::locale::classic());
- ostr << this->Data.Unsigned__Int64;
- return vtkStdString(ostr.str());
- }
-#endif
#if defined(VTK_TYPE_USE_LONG_LONG)
if (this->IsLongLong())
{
@@ -1000,11 +941,6 @@ vtkVariantToNumericInstantiateMacro(unsigned int);
vtkVariantToNumericInstantiateMacro(long);
vtkVariantToNumericInstantiateMacro(unsigned long);
-#if defined(VTK_TYPE_USE___INT64)
-vtkVariantToNumericInstantiateMacro(__int64);
-vtkVariantToNumericInstantiateMacro(unsigned __int64);
-#endif
-
#if defined(VTK_TYPE_USE_LONG_LONG)
vtkVariantToNumericInstantiateMacro(long long);
vtkVariantToNumericInstantiateMacro(unsigned long long);
@@ -1070,18 +1006,6 @@ unsigned long vtkVariant::ToUnsignedLong(bool *valid) const
return this->ToNumeric(valid, static_cast<unsigned long *>(0));
}
-#if defined(VTK_TYPE_USE___INT64)
-__int64 vtkVariant::To__Int64(bool *valid) const
-{
- return this->ToNumeric(valid, static_cast<__int64 *>(0));
-}
-
-unsigned __int64 vtkVariant::ToUnsigned__Int64(bool *valid) const
-{
- return this->ToNumeric(valid, static_cast<unsigned __int64 *>(0));
-}
-#endif
-
#if defined(VTK_TYPE_USE_LONG_LONG)
long long vtkVariant::ToLongLong(bool *valid) const
{
@@ -1171,14 +1095,6 @@ ostream& operator << ( ostream& os, const vtkVariant& val )
case VTK_UNSIGNED_LONG:
os << val.Data.UnsignedLong;
break;
-#if defined(VTK_TYPE_USE___INT64)
- case VTK___INT64:
- os << val.Data.__Int64;
- break;
- case VTK_UNSIGNED___INT64:
- os << val.Data.Unsigned__Int64;
- break;
-#endif
#if defined(VTK_TYPE_USE_LONG_LONG)
case VTK_LONG_LONG:
os << val.Data.LongLong;
diff --git a/Common/Core/vtkVariant.h b/Common/Core/vtkVariant.h
index ffdb00bfd1fac9481dbe75e0fa02b77f1cbda932..018542c7e324274d040ebc9c3525760e4c9a618e 100644
--- a/Common/Core/vtkVariant.h
+++ b/Common/Core/vtkVariant.h
@@ -124,15 +124,6 @@ public:
// Create an unsigned long variant.
vtkVariant(unsigned long value);
-#if defined(VTK_TYPE_USE___INT64)
- // Description:
- // Create an __int64 variant.
- vtkVariant(__int64 value);
-
- // Description:
- // Create an unsigned __int64 variant.
- vtkVariant(unsigned __int64 value);
-#endif
#if defined(VTK_TYPE_USE_LONG_LONG)
// Description:
// Create a long long variant.
@@ -236,11 +227,11 @@ public:
bool IsUnsignedLong() const;
// Description:
- // Get whether the variant is an __int64.
+ // Legacy. Returns false. The variant is never an __int64.
bool Is__Int64() const;
// Description:
- // Get whether the variant is an unsigned __int64.
+ // Legacy. Returns false. The variant is never an unsigned __int64.
bool IsUnsigned__Int64() const;
// Description:
@@ -316,14 +307,6 @@ public:
unsigned long ToUnsignedLong(bool *valid) const;
unsigned long ToUnsignedLong() const {
return this->ToUnsignedLong(0); };
-#if defined(VTK_TYPE_USE___INT64)
- __int64 To__Int64(bool *valid) const;
- __int64 To__Int64() const {
- return this->To__Int64(0); };
- unsigned __int64 ToUnsigned__Int64(bool *valid) const;
- unsigned __int64 ToUnsigned__Int64() const {
- return this->ToUnsigned__Int64(0); };
-#endif
#if defined(VTK_TYPE_USE_LONG_LONG)
long long ToLongLong(bool *valid) const;
long long ToLongLong() const {
@@ -418,10 +401,6 @@ private:
unsigned int UnsignedInt;
long Long;
unsigned long UnsignedLong;
-#if defined(VTK_TYPE_USE___INT64)
- __int64 __Int64;
- unsigned __int64 Unsigned__Int64;
-#endif
#if defined(VTK_TYPE_USE_LONG_LONG)
long long LongLong;
unsigned long long UnsignedLongLong;
diff --git a/Common/Core/vtkVariantCast.h b/Common/Core/vtkVariantCast.h
index 1c4f58229c8e45313796a00465b14a8597ca7efb..fc70235a104bb7132058bb134fd489878b74f1f2 100644
--- a/Common/Core/vtkVariantCast.h
+++ b/Common/Core/vtkVariantCast.h
@@ -101,23 +101,6 @@ inline unsigned long vtkVariantCast<unsigned long>(const vtkVariant& value, bool
return value.ToUnsignedLong(valid);
}
-#ifdef VTK_TYPE_USE___INT64
-
-template<>
-inline __int64 vtkVariantCast<__int64>(const vtkVariant& value, bool* valid)
-{
- return value.To__Int64(valid);
-}
-
-template<>
-inline unsigned __int64 vtkVariantCast<unsigned __int64>(const vtkVariant& value, bool* valid)
-{
- return value.ToUnsigned__Int64(valid);
-}
-
-#endif
-
-
#ifdef VTK_TYPE_USE_LONG_LONG
template<>
diff --git a/Common/Core/vtkVariantCreate.h b/Common/Core/vtkVariantCreate.h
index 1e083b541d5fde30071a07c64cb44bab91489911..907f80c7df859c5a75f09889854a2c0e47df73a0 100644
--- a/Common/Core/vtkVariantCreate.h
+++ b/Common/Core/vtkVariantCreate.h
@@ -91,23 +91,6 @@ inline vtkVariant vtkVariantCreate<unsigned long>(const unsigned long& value)
return value;
}
-#ifdef VTK_TYPE_USE___INT64
-
-template<>
-inline vtkVariant vtkVariantCreate<__int64>(const __int64& value)
-{
- return value;
-}
-
-template<>
-inline vtkVariant vtkVariantCreate<unsigned __int64>(const unsigned __int64& value)
-{
- return value;
-}
-
-#endif
-
-
#ifdef VTK_TYPE_USE_LONG_LONG
template<>
diff --git a/Common/Core/vtkVariantExtract.h b/Common/Core/vtkVariantExtract.h
index af97b602b6b34ac56146fac81cbf4c77cdf77b80..c17baf01b9042a7fa1037615c045865b5cd94d18 100644
--- a/Common/Core/vtkVariantExtract.h
+++ b/Common/Core/vtkVariantExtract.h
@@ -106,25 +106,6 @@ inline unsigned long vtkVariantExtract<unsigned long>(const vtkVariant& value, b
return valid ? value.ToUnsignedLong() : 0;
}
-#ifdef VTK_TYPE_USE___INT64
-
-template<>
-inline __int64 vtkVariantExtract<__int64>(const vtkVariant& value, bool& valid)
-{
- valid = value.Is__Int64();
- return valid ? value.To__Int64() : 0;
-}
-
-template<>
-inline unsigned __int64 vtkVariantExtract<unsigned __int64>(const vtkVariant& value, bool& valid)
-{
- valid = value.IsUnsigned__Int64();
- return valid ? value.ToUnsigned__Int64() : 0;
-}
-
-#endif
-
-
#ifdef VTK_TYPE_USE_LONG_LONG
template<>
diff --git a/Common/Core/vtkVariantInlineOperators.h b/Common/Core/vtkVariantInlineOperators.h
index b47e3a729900eaa1c36d630330363d971050a7c0..415ce3fa09195bc502df5f6e0e04343766d74bce 100644
--- a/Common/Core/vtkVariantInlineOperators.h
+++ b/Common/Core/vtkVariantInlineOperators.h
@@ -12,15 +12,8 @@
inline bool
IsSigned64Bit(int VariantType)
{
-#if defined(VTK_TYPE_USE_LONG_LONG) && defined(VTK_TYPE_USE___INT64)
+#if defined(VTK_TYPE_USE_LONG_LONG)
return ((VariantType == VTK_LONG_LONG) ||
- (VariantType == VTK___INT64) ||
- (VariantType == VTK_TYPE_INT64));
-#elif defined(VTK_TYPE_USE_LONG_LONG)
- return ((VariantType == VTK_LONG_LONG) ||
- (VariantType == VTK_TYPE_INT64));
-#elif defined(VTK_TYPE_USE___INT64)
- return ((VariantType == VTK___INT64) ||
(VariantType == VTK_TYPE_INT64));
#else
return (VariantType == VTK_TYPE_INT64);
diff --git a/Common/Core/vtkVariantToNumeric.cxx b/Common/Core/vtkVariantToNumeric.cxx
index f082e4eadd4835dac1ae399829eb2c030ebfb371..c7e0f22651f0f55ea5f11b40506c7d4be71ccc42 100644
--- a/Common/Core/vtkVariantToNumeric.cxx
+++ b/Common/Core/vtkVariantToNumeric.cxx
@@ -78,16 +78,6 @@ T vtkVariant::ToNumeric(bool* valid, T* vtkNotUsed(ignored)) const
{
return static_cast<T>(this->Data.UnsignedLong);
}
-#if defined(VTK_TYPE_USE___INT64)
- if (this->Is__Int64())
- {
- return static_cast<T>(this->Data.__Int64);
- }
- if (this->IsUnsigned__Int64())
- {
- return static_cast<T>(static_cast<__int64>(this->Data.Unsigned__Int64));
- }
-#endif
#if defined(VTK_TYPE_USE_LONG_LONG)
if (this->IsLongLong())
{
diff --git a/Common/Core/vtk__Int64Array.cxx b/Common/Core/vtk__Int64Array.cxx
deleted file mode 100644
index 0f11ed413e7532309ad726ad5c55e86636beb4cb..0000000000000000000000000000000000000000
--- a/Common/Core/vtk__Int64Array.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*=========================================================================
-
- Program: Visualization Toolkit
- Module: vtk__Int64Array.cxx
-
- Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
- All rights reserved.
- See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notice for more information.
-
-=========================================================================*/
-// Instantiate superclass first to give the template a DLL interface.
-#include "vtkDataArrayTemplate.txx"
-VTK_DATA_ARRAY_TEMPLATE_INSTANTIATE(__int64);
-
-#include "vtkArrayIteratorTemplate.txx"
-VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(__int64);
-
-#define vtk__Int64Array_cxx
-#include "vtk__Int64Array.h"
-
-#include "vtkObjectFactory.h"
-
-//----------------------------------------------------------------------------
-vtkStandardNewMacro(vtk__Int64Array);
-
-//----------------------------------------------------------------------------
-vtk__Int64Array::vtk__Int64Array(vtkIdType numComp): RealSuperclass(numComp)
-{
-}
-
-//----------------------------------------------------------------------------
-vtk__Int64Array::~vtk__Int64Array()
-{
-}
-
-//----------------------------------------------------------------------------
-void vtk__Int64Array::PrintSelf(ostream& os, vtkIndent indent)
-{
- this->RealSuperclass::PrintSelf(os,indent);
-}
diff --git a/Common/Core/vtk__Int64Array.h b/Common/Core/vtk__Int64Array.h
deleted file mode 100644
index 606d22342f5434742052ccdac23627403a05d80b..0000000000000000000000000000000000000000
--- a/Common/Core/vtk__Int64Array.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*=========================================================================
-
- Program: Visualization Toolkit
- Module: vtk__Int64Array.h
-
- Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
- All rights reserved.
- See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notice for more information.
-
-=========================================================================*/
-// .NAME vtk__Int64Array - dynamic, self-adjusting array of __int64
-// .SECTION Description
-// vtk__Int64Array is an array of values of type __int64.
-// It provides methods for insertion and retrieval of values and will
-// automatically resize itself to hold new data.
-//
-// This class is intended to give an array of 64 bit integers on systems
-// where __int64 is the only 64 bit integer type. If an array of 64 bit
-// integers is needed, prefer vtkTypeInt64Array, which will always uses
-// the system's most appropriate datatype for 64 bit integers.
-
-#ifndef vtk__Int64Array_h
-#define vtk__Int64Array_h
-
-// Tell the template header how to give our superclass a DLL interface.
-#if !defined(vtk__Int64Array_cxx)
-# define VTK_DATA_ARRAY_TEMPLATE_TYPE __int64
-#endif
-
-#include "vtkCommonCoreModule.h" // For export macro
-#include "vtkDataArray.h"
-#include "vtkDataArrayTemplate.h" // Real Superclass
-
-// Fake the superclass for the wrappers.
-#ifndef __WRAP__
-#define vtkDataArray vtkDataArrayTemplate<__int64>
-#endif
-class VTKCOMMONCORE_EXPORT vtk__Int64Array : public vtkDataArray
-#ifndef __WRAP__
-#undef vtkDataArray
-#endif
-{
-public:
- static vtk__Int64Array* New();
- vtkTypeMacro(vtk__Int64Array,vtkDataArray);
- void PrintSelf(ostream& os, vtkIndent indent);
-
- // This macro expands to the set of method declarations that
- // make up the interface of vtkDataArrayTemplate, which is ignored
- // by the wrappers.
-#if defined(__WRAP__) || defined (__WRAP_GCCXML__)
- vtkCreateWrappedArrayInterface(__int64);
-#endif
-
- // Description:
- // Get the minimum data value in its native type.
- static __int64 GetDataTypeValueMin() { return VTK___INT64_MIN; }
-
- // Description:
- // Get the maximum data value in its native type.
- static __int64 GetDataTypeValueMax() { return VTK___INT64_MAX; }
-
-protected:
- vtk__Int64Array(vtkIdType numComp=1);
- ~vtk__Int64Array();
-
-private:
- //BTX
- typedef vtkDataArrayTemplate<__int64> RealSuperclass;
- //ETX
- vtk__Int64Array(const vtk__Int64Array&); // Not implemented.
- void operator=(const vtk__Int64Array&); // Not implemented.
-};
-
-#endif
diff --git a/Common/DataModel/vtkImageIterator.cxx b/Common/DataModel/vtkImageIterator.cxx
index 26b680cca41977029dc3754bb717384ef7624150..9ed4a0fbe96df8ef0495f3bd74883831cd42c32d 100644
--- a/Common/DataModel/vtkImageIterator.cxx
+++ b/Common/DataModel/vtkImageIterator.cxx
@@ -30,7 +30,3 @@ template class VTKCOMMONDATAMODEL_EXPORT vtkImageIterator<unsigned int>;
template class VTKCOMMONDATAMODEL_EXPORT vtkImageIterator<long long>;
template class VTKCOMMONDATAMODEL_EXPORT vtkImageIterator<unsigned long long>;
#endif
-#if defined(VTK_TYPE_USE___INT64)
-template class VTKCOMMONDATAMODEL_EXPORT vtkImageIterator<__int64>;
-template class VTKCOMMONDATAMODEL_EXPORT vtkImageIterator<unsigned __int64>;
-#endif
diff --git a/Common/DataModel/vtkXMLDataElement.cxx b/Common/DataModel/vtkXMLDataElement.cxx
index 68b6c8493f62cffbdc4b4f22bc5d0b48956481bc..9ed1ad5fa9b5a4dbdfe242ebe76a16260a6d24ab 100644
--- a/Common/DataModel/vtkXMLDataElement.cxx
+++ b/Common/DataModel/vtkXMLDataElement.cxx
@@ -735,20 +735,6 @@ int vtkXMLDataElement::GetScalarAttribute(const char* name,
}
#endif
-//----------------------------------------------------------------------------
-#ifdef VTK_TYPE_USE___INT64
-int vtkXMLDataElement::GetScalarAttribute(const char* name,
- __int64& value)
-{
- return this->GetVectorAttribute(name, 1, &value);
-}
-int vtkXMLDataElement::GetScalarAttribute(const char* name,
- unsigned __int64& value)
-{
- return this->GetVectorAttribute(name, 1, &value);
-}
-#endif
-
//----------------------------------------------------------------------------
template <class T>
int vtkXMLDataElementVectorAttributeParse(const char* str, int length, T* data)
@@ -814,22 +800,6 @@ int vtkXMLDataElement::GetVectorAttribute(const char* name, int length,
}
#endif
-//----------------------------------------------------------------------------
-#ifdef VTK_TYPE_USE___INT64
-int vtkXMLDataElement::GetVectorAttribute(const char* name, int length,
- __int64* data)
-{
- return vtkXMLDataElementVectorAttributeParse(this->GetAttribute(name),
- length, data);
-}
-int vtkXMLDataElement::GetVectorAttribute(const char* name, int length,
- unsigned __int64* data)
-{
- return vtkXMLDataElementVectorAttributeParse(this->GetAttribute(name),
- length, data);
-}
-#endif
-
//----------------------------------------------------------------------------
int vtkXMLDataElement::GetWordTypeAttribute(const char* name, int& value)
{
@@ -959,9 +929,6 @@ int vtkXMLDataElement::GetWordTypeAttribute(const char* name, int& value)
#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.");
return 0;
@@ -981,9 +948,6 @@ int vtkXMLDataElement::GetWordTypeAttribute(const char* name, int& value)
#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) && VTK_SIZEOF___INT64 == 8
- value = VTK_UNSIGNED___INT64;
- return 1;
#else
vtkErrorMacro("UInt64 support not compiled in VTK.");
return 0;
@@ -1091,20 +1055,6 @@ void vtkXMLDataElement::SetVectorAttribute(const char* name, int length,
}
#endif
-//----------------------------------------------------------------------------
-#ifdef VTK_TYPE_USE___INT64
-void vtkXMLDataElement::SetVectorAttribute(const char* name, int length,
- __int64 const* data)
-{
- vtkXMLDataElementVectorAttributeSet(this, name, length, data);
-}
-void vtkXMLDataElement::SetVectorAttribute(const char* name, int length,
- unsigned __int64 const* data)
-{
- vtkXMLDataElementVectorAttributeSet(this, name, length, data);
-}
-#endif
-
//----------------------------------------------------------------------------
int vtkXMLDataElement::IsSpace(char c)
{
diff --git a/Common/DataModel/vtkXMLDataElement.h b/Common/DataModel/vtkXMLDataElement.h
index 0b582592c7d86428c46622b8691254c1e40e5bf5..7ae0005214e1865ad3dac6e362da7828555c1f23 100644
--- a/Common/DataModel/vtkXMLDataElement.h
+++ b/Common/DataModel/vtkXMLDataElement.h
@@ -104,14 +104,6 @@ public:
int GetScalarAttribute(const char* name, unsigned long long& value);
int GetVectorAttribute(const char* name, int length, unsigned long long* value);
void SetVectorAttribute(const char* name, int length, unsigned long long const* value);
-#endif
-#ifdef VTK_TYPE_USE___INT64
- int GetScalarAttribute(const char* name, __int64& value);
- int GetVectorAttribute(const char* name, int length, __int64* value);
- void SetVectorAttribute(const char* name, int length, __int64 const* value);
- int GetScalarAttribute(const char* name, unsigned __int64& value);
- int GetVectorAttribute(const char* name, int length, unsigned __int64* value);
- void SetVectorAttribute(const char* name, int length, unsigned __int64 const* value);
#endif
//ETX
diff --git a/Common/ExecutionModel/vtkImageProgressIterator.cxx b/Common/ExecutionModel/vtkImageProgressIterator.cxx
index 33d17a1f86496547dadb1254112ca4c6aa749541..69bf631859101222b18b5259e0177f1363bcc4f9 100644
--- a/Common/ExecutionModel/vtkImageProgressIterator.cxx
+++ b/Common/ExecutionModel/vtkImageProgressIterator.cxx
@@ -45,7 +45,3 @@ template class VTKCOMMONEXECUTIONMODEL_EXPORT vtkImageProgressIterator<unsigned
template class VTKCOMMONEXECUTIONMODEL_EXPORT vtkImageProgressIterator<long long>;
template class VTKCOMMONEXECUTIONMODEL_EXPORT vtkImageProgressIterator<unsigned long long>;
#endif
-#if defined(VTK_TYPE_USE___INT64)
-template class VTKCOMMONEXECUTIONMODEL_EXPORT vtkImageProgressIterator<__int64>;
-template class VTKCOMMONEXECUTIONMODEL_EXPORT vtkImageProgressIterator<unsigned __int64>;
-#endif
diff --git a/IO/Legacy/vtkDataReader.cxx b/IO/Legacy/vtkDataReader.cxx
index 619f0ddaf5408fb63367d5a427e8236a7c71aef7..7de49c175f509910ecfd695bcd27be0c5f08e81c 100644
--- a/IO/Legacy/vtkDataReader.cxx
+++ b/IO/Legacy/vtkDataReader.cxx
@@ -48,8 +48,7 @@
#include <sstream>
// We only have vtkTypeUInt64Array if we have long long
-// or we have __int64 with conversion to double.
-#if defined(VTK_TYPE_USE_LONG_LONG) || defined(VTK_TYPE_USE___INT64)
+#if defined(VTK_TYPE_USE_LONG_LONG)
#include "vtkTypeUInt64Array.h"
#endif
@@ -320,28 +319,6 @@ int vtkDataReader::Read(unsigned long *result)
return 1;
}
-#if defined(VTK_TYPE_USE___INT64)
-int vtkDataReader::Read(__int64 *result)
-{
- *this->IS >> *result;
- if (this->IS->fail())
- {
- return 0;
- }
- return 1;
-}
-
-int vtkDataReader::Read(unsigned __int64 *result)
-{
- *this->IS >> *result;
- if (this->IS->fail())
- {
- return 0;
- }
- return 1;
-}
-#endif
-
#if defined(VTK_TYPE_USE_LONG_LONG)
int vtkDataReader::Read(long long *result)
{
@@ -1611,8 +1588,7 @@ vtkAbstractArray *vtkDataReader::ReadArray(const char *dataType, int numTuples,
else if ( ! strncmp(type, "vtktypeuint64", 13) )
{
// We only have vtkTypeUInt64Array if we have long long
-// or we have __int64.
-#if defined(VTK_TYPE_USE_LONG_LONG) || defined(VTK_TYPE_USE___INT64)
+#if defined(VTK_TYPE_USE_LONG_LONG)
array = vtkTypeUInt64Array::New();
array->SetNumberOfComponents(numComp);
vtkTypeUInt64 *ptr = ((vtkTypeUInt64Array *)array)->WritePointer(0,numTuples*numComp);
@@ -1886,14 +1862,6 @@ vtkAbstractArray *vtkDataReader::ReadArray(const char *dataType, int numTuples,
case VTK_UNSIGNED_LONG_LONG:
v = sv.ToUnsignedLongLong();
break;
-#endif
-#ifdef VTK_TYPE_USE___INT64
- case VTK___INT64:
- v = sv.To__Int64();
- break;
- case VTK_UNSIGNED___INT64:
- v = sv.ToUnsigned__Int64();
- break;
#endif
case VTK_STRING:
v = sv.ToString();
diff --git a/IO/Legacy/vtkDataReader.h b/IO/Legacy/vtkDataReader.h
index 01bb12d001f1ad09b107af1083d50bdd3896893a..f58f87bcbc11e8d3035d99f3486742443ebd2258 100644
--- a/IO/Legacy/vtkDataReader.h
+++ b/IO/Legacy/vtkDataReader.h
@@ -310,10 +310,6 @@ public:
int Read(unsigned int *);
int Read(long *);
int Read(unsigned long *);
-#if defined(VTK_TYPE_USE___INT64)
- int Read(__int64 *result);
- int Read(unsigned __int64 *result);
-#endif
#if defined(VTK_TYPE_USE_LONG_LONG)
int Read(long long *result);
int Read(unsigned long long *result);
diff --git a/IO/Legacy/vtkDataWriter.cxx b/IO/Legacy/vtkDataWriter.cxx
index 196eb7b124b2dc87d9883bc207c77bb3ce011bc9..d2494f10ddfafc041349aea8ec74d72c72b3d2cf 100644
--- a/IO/Legacy/vtkDataWriter.cxx
+++ b/IO/Legacy/vtkDataWriter.cxx
@@ -1122,29 +1122,6 @@ int vtkDataWriter::WriteArray(ostream *fp, int dataType, vtkAbstractArray *data,
}
break;
-#if defined(VTK_TYPE_USE___INT64)
- case VTK___INT64:
- {
- sprintf (str, format, "vtktypeint64"); *fp << str;
- __int64 *s= static_cast<__int64*>(data->GetVoidPointer(0));
- strcpy(outputFormat, vtkTypeTraits<__int64>::ParseFormat());
- strcat(outputFormat, " ");
- vtkWriteDataArray(fp, s, this->FileType, outputFormat, num, numComp);
- }
- break;
-
- case VTK_UNSIGNED___INT64:
- {
- sprintf (str, format, "vtktypeuint64"); *fp << str;
- unsigned __int64 *s=
- static_cast<unsigned __int64*>(data->GetVoidPointer(0));
- strcpy(outputFormat, vtkTypeTraits<unsigned __int64>::ParseFormat());
- strcat(outputFormat, " ");
- vtkWriteDataArray(fp, s, this->FileType, outputFormat, num, numComp);
- }
- break;
-#endif
-
#if defined(VTK_TYPE_USE_LONG_LONG)
case VTK_LONG_LONG:
{
diff --git a/IO/MPIParallel/vtkMPIMultiBlockPLOT3DReader.cxx b/IO/MPIParallel/vtkMPIMultiBlockPLOT3DReader.cxx
index c038ada62e13aa57e08bb4cb1ff6c792884a4400..f7ed6c6ea336503174e79a7bbd0a049e23276474 100644
--- a/IO/MPIParallel/vtkMPIMultiBlockPLOT3DReader.cxx
+++ b/IO/MPIParallel/vtkMPIMultiBlockPLOT3DReader.cxx
@@ -47,15 +47,6 @@ namespace
#if defined(VTK_TYPE_USE_LONG_LONG)
DEFINE_MPI_TYPE(long long, MPI_LONG_LONG);
DEFINE_MPI_TYPE(unsigned long long, MPI_UNSIGNED_LONG_LONG);
-#endif
-#if defined(VTK_TYPE_USE___INT64)
-# if VTK_SIZEOF_LONG == 8
- DEFINE_MPI_TYPE(__int64, MPI_LONG);
- DEFINE_MPI_TYPE(unsigned __int64, MPI_UNSIGNED_LONG);
-# elif defined(MPI_LONG_LONG)
- DEFINE_MPI_TYPE(__int64, MPI_LONG_LONG);
- DEFINE_MPI_TYPE(__int64, MPI_UNSIGNED_LONG_LONG);
-# endif
#endif
class MPIPlot3DException : public std::exception
diff --git a/IO/SQL/vtkSQLQuery.cxx b/IO/SQL/vtkSQLQuery.cxx
index aad591ee40a2cd49494dbf138ed9fa843f85308a..bcf6cb9cb0adfdabc2bc682aa64eb7ff1d84a878 100644
--- a/IO/SQL/vtkSQLQuery.cxx
+++ b/IO/SQL/vtkSQLQuery.cxx
@@ -213,10 +213,6 @@ bool vtkSQLQuery::BindParameter(int index, vtkVariant data)
VTK_VARIANT_BIND_PARAMETER(VTK_UNSIGNED_INT,ToUnsignedInt);
VTK_VARIANT_BIND_PARAMETER(VTK_LONG,ToLong);
VTK_VARIANT_BIND_PARAMETER(VTK_UNSIGNED_LONG,ToUnsignedLong);
-#if defined(VTK_TYPE_USE___INT64)
- VTK_VARIANT_BIND_PARAMETER(VTK___INT64,To__Int64);
- VTK_VARIANT_BIND_PARAMETER(VTK_UNSIGNED___INT64,ToUnsigned__Int64);
-#endif
#if defined(VTK_TYPE_USE_LONG_LONG)
VTK_VARIANT_BIND_PARAMETER(VTK_LONG_LONG,ToLongLong);
VTK_VARIANT_BIND_PARAMETER(VTK_UNSIGNED_LONG_LONG,ToUnsignedLongLong);
diff --git a/IO/XML/vtkXMLWriter.cxx b/IO/XML/vtkXMLWriter.cxx
index e56e3fee255bf0c7b336c617aa73912b3ebeb314..c1d4e459146339df1063fb8b4ebfd418495faec1 100644
--- a/IO/XML/vtkXMLWriter.cxx
+++ b/IO/XML/vtkXMLWriter.cxx
@@ -1586,10 +1586,6 @@ const char* vtkXMLWriter::GetWordTypeName(int dataType)
#if defined(VTK_TYPE_USE_LONG_LONG)
case VTK_LONG_LONG: isSigned = 1; size = sizeof(long long); break;
case VTK_UNSIGNED_LONG_LONG: isSigned = 0; size = sizeof(unsigned long long); break;
-#endif
-#if defined(VTK_TYPE_USE___INT64)
- case VTK___INT64: isSigned = 1; size = sizeof(__int64); break;
- case VTK_UNSIGNED___INT64: isSigned = 0; size = sizeof(unsigned __int64); break;
#endif
default:
{
diff --git a/Imaging/Core/vtkImageInterpolatorInternals.h b/Imaging/Core/vtkImageInterpolatorInternals.h
index 954573c118da662671e79875d01860fa9f1ed911..ca24df30679749e7c798f34e3e1fd90b7772babd 100644
--- a/Imaging/Core/vtkImageInterpolatorInternals.h
+++ b/Imaging/Core/vtkImageInterpolatorInternals.h
@@ -97,15 +97,9 @@ inline int vtkInterpolationMath::Floor(double x, F &f)
{
#if defined VTK_INTERPOLATE_64BIT_FLOOR
x += (103079215104.0 + VTK_INTERPOLATE_FLOOR_TOL);
-#ifdef VTK_TYPE_USE___INT64
- __int64 i = static_cast<__int64>(x);
- f = x - i;
- return static_cast<int>(i - 103079215104i64);
-#else
long long i = static_cast<long long>(x);
f = static_cast<F>(x - i);
return static_cast<int>(i - 103079215104LL);
-#endif
#elif defined VTK_INTERPOLATE_32BIT_FLOOR
x += (2147483648.0 + VTK_INTERPOLATE_FLOOR_TOL);
unsigned int i = static_cast<unsigned int>(x);
@@ -129,13 +123,8 @@ inline int vtkInterpolationMath::Round(double x)
{
#if defined VTK_INTERPOLATE_64BIT_FLOOR
x += (103079215104.5 + VTK_INTERPOLATE_FLOOR_TOL);
-#ifdef VTK_TYPE_USE___INT64
- __int64 i = static_cast<__int64>(x);
- return static_cast<int>(i - 103079215104i64);
-#else
long long i = static_cast<long long>(x);
return static_cast<int>(i - 103079215104LL);
-#endif
#elif defined VTK_INTERPOLATE_32BIT_FLOOR
x += (2147483648.5 + VTK_INTERPOLATE_FLOOR_TOL);
unsigned int i = static_cast<unsigned int>(x);
diff --git a/Imaging/Core/vtkImageStencilIterator.cxx b/Imaging/Core/vtkImageStencilIterator.cxx
index 8d66170e2ca84ae4220dc31537dd341fc1abc4d0..0de4271b58c0b6ba64772d971622da71e540f935 100644
--- a/Imaging/Core/vtkImageStencilIterator.cxx
+++ b/Imaging/Core/vtkImageStencilIterator.cxx
@@ -30,7 +30,3 @@ template class VTKIMAGINGCORE_EXPORT vtkImageStencilIterator<unsigned int>;
template class VTKIMAGINGCORE_EXPORT vtkImageStencilIterator<long long>;
template class VTKIMAGINGCORE_EXPORT vtkImageStencilIterator<unsigned long long>;
#endif
-#if defined(VTK_TYPE_USE___INT64)
-template class VTKIMAGINGCORE_EXPORT vtkImageStencilIterator<__int64>;
-template class VTKIMAGINGCORE_EXPORT vtkImageStencilIterator<unsigned __int64>;
-#endif
diff --git a/Infovis/Boost/vtkVariantBoostSerialization.h b/Infovis/Boost/vtkVariantBoostSerialization.h
index ab50f6595f33bcf9d53a364f330746018fe567ed..90c751cf0ca0fa19e977efdaa774789fc9e557bc 100644
--- a/Infovis/Boost/vtkVariantBoostSerialization.h
+++ b/Infovis/Boost/vtkVariantBoostSerialization.h
@@ -120,10 +120,6 @@ void save(Archiver& ar, const vtkVariant& variant,
VTK_VARIANT_SAVE(VTK_UNSIGNED_INT,unsigned int,ToUnsignedInt);
VTK_VARIANT_SAVE(VTK_LONG,long,ToLong);
VTK_VARIANT_SAVE(VTK_UNSIGNED_LONG,unsigned long,ToUnsignedLong);
-#if defined(VTK_TYPE_USE___INT64)
- VTK_VARIANT_SAVE(VTK___INT64,vtkTypeInt64,ToTypeInt64);
- VTK_VARIANT_SAVE(VTK_UNSIGNED___INT64,vtkTypeUInt64,ToTypeUInt64);
-#endif
#if defined(VTK_TYPE_USE_LONG_LONG)
VTK_VARIANT_SAVE(VTK_LONG_LONG,long long,ToLongLong);
VTK_VARIANT_SAVE(VTK_UNSIGNED_LONG_LONG,unsigned long long,
@@ -167,10 +163,6 @@ void load(Archiver& ar, vtkVariant& variant,
VTK_VARIANT_LOAD(VTK_UNSIGNED_INT,unsigned int);
VTK_VARIANT_LOAD(VTK_LONG,long);
VTK_VARIANT_LOAD(VTK_UNSIGNED_LONG,unsigned long);
-#if defined(VTK_TYPE_USE___INT64)
- VTK_VARIANT_LOAD(VTK___INT64,vtkTypeInt64);
- VTK_VARIANT_LOAD(VTK_UNSIGNED___INT64,vtkTypeUInt64);
-#endif
#if defined(VTK_TYPE_USE_LONG_LONG)
VTK_VARIANT_LOAD(VTK_LONG_LONG,long long);
VTK_VARIANT_LOAD(VTK_UNSIGNED_LONG_LONG,unsigned long long);
diff --git a/Rendering/Label/vtkDynamic2DLabelMapper.cxx b/Rendering/Label/vtkDynamic2DLabelMapper.cxx
index 9bc382aad1860fffba1d8d447baa5f0ba3cd73ae..b97c42be71b0cbfcb991430f54c69709679ff4ac 100644
--- a/Rendering/Label/vtkDynamic2DLabelMapper.cxx
+++ b/Rendering/Label/vtkDynamic2DLabelMapper.cxx
@@ -310,13 +310,6 @@ void vtkDynamic2DLabelMapper::RenderOpaqueGeometry(vtkViewport *viewport,
FormatString = vtkTypeTraits<unsigned long long>::ParseFormat(); break;
#endif
-#if defined(VTK_TYPE_USE___INT64)
- case VTK___INT64:
- FormatString = vtkTypeTraits<__int64>::ParseFormat(); break;
- case VTK_UNSIGNED___INT64:
- FormatString = vtkTypeTraits<unsigned __int64>::ParseFormat(); break;
-#endif
-
case VTK_FLOAT:
FormatString = vtkTypeTraits<float>::ParseFormat(); break;
diff --git a/Rendering/Label/vtkLabeledDataMapper.cxx b/Rendering/Label/vtkLabeledDataMapper.cxx
index ffb104427d8b4e9e200fe54b59eb129b86d3c66a..3e65cdf2fca648e2a69a99d23006b2f31ad11652 100644
--- a/Rendering/Label/vtkLabeledDataMapper.cxx
+++ b/Rendering/Label/vtkLabeledDataMapper.cxx
@@ -498,13 +498,6 @@ void vtkLabeledDataMapper::BuildLabelsInternal(vtkDataSet* input)
FormatString = vtkTypeTraits<unsigned long long>::ParseFormat(); break;
#endif
-#if defined(VTK_TYPE_USE___INT64)
- case VTK___INT64:
- FormatString = vtkTypeTraits<__int64>::ParseFormat(); break;
- case VTK_UNSIGNED___INT64:
- FormatString = vtkTypeTraits<unsigned __int64>::ParseFormat(); break;
-#endif
-
case VTK_FLOAT:
FormatString = vtkTypeTraits<float>::ParseFormat(); break;
diff --git a/Rendering/ParallelLIC/vtkMPIPixelTT.cxx b/Rendering/ParallelLIC/vtkMPIPixelTT.cxx
index 316042fee51b8a3d788b14db98b74c3382b8415d..f92b6b62ab2b8555fb7c16ade46bbb25f83f31a5 100644
--- a/Rendering/ParallelLIC/vtkMPIPixelTT.cxx
+++ b/Rendering/ParallelLIC/vtkMPIPixelTT.cxx
@@ -35,7 +35,3 @@ vtkMPIPixelTTMacro2(double, MPI_DOUBLE, VTK_DOUBLE)
vtkMPIPixelTTMacro2(long long, MPI_LONG_LONG, VTK_LONG_LONG)
vtkMPIPixelTTMacro2(unsigned long long, MPI_UNSIGNED_LONG_LONG, VTK_UNSIGNED_LONG_LONG)
#endif
-#ifdef VTK_TYPE_USE___INT64
-vtkMPIPixelTTMacro2(__int64, MPI_LONG_LONG, VTK___INT64)
-vtkMPIPixelTTMacro2(unsigned __int64, MPI_UNSIGNED_LONG_LONG, VTK_UNSIGNED___INT64)
-#endif
diff --git a/Rendering/ParallelLIC/vtkMPIPixelTT.h b/Rendering/ParallelLIC/vtkMPIPixelTT.h
index 4e15dff1e407e58d33b7acf1668ccfbd50c8b7a3..f047a5a69311cd853aa05fd5c3a1a109304a17bc 100644
--- a/Rendering/ParallelLIC/vtkMPIPixelTT.h
+++ b/Rendering/ParallelLIC/vtkMPIPixelTT.h
@@ -50,10 +50,6 @@ vtkMPIPixelTTMacro1(double)
vtkMPIPixelTTMacro1(long long)
vtkMPIPixelTTMacro1(unsigned long long)
#endif
-#ifdef VTK_TYPE_USE___INT64
-vtkMPIPixelTTMacro1(__int64)
-vtkMPIPixelTTMacro1(unsigned __int64)
-#endif
//ETX
#endif
// VTK-HeaderTest-Exclude: vtkMPIPixelTT.h
diff --git a/Rendering/Tk/vtkTkRenderWidget.cxx b/Rendering/Tk/vtkTkRenderWidget.cxx
index 8756c58a4e0be2545a78152707b853dbcd321f07..ae7e877a691e820fa1854116094befe20dd6f0d3 100644
--- a/Rendering/Tk/vtkTkRenderWidget.cxx
+++ b/Rendering/Tk/vtkTkRenderWidget.cxx
@@ -175,9 +175,6 @@ extern "C" {
#if defined(VTK_TYPE_USE_LONG_LONG)
unsigned long long l;
sscanf ( argv[1], "_%llx_%s", &l, typeCheck);
-#elif defined(VTK_TYPE_USE___INT64)
- unsigned __int64 l;
- sscanf ( argv[1], "_%I64x_%s", &l, typeCheck);
#else
unsigned long l;
sscanf ( argv[1], "_%lx_%s", &l, typeCheck);
diff --git a/Wrapping/Java/vtkJavaUtil.cxx b/Wrapping/Java/vtkJavaUtil.cxx
index d139a31a2dd594e2ce7643ae4ade21f3558ecd83..a25e93f0a63924b3c8db49be11ac0d1f62834919 100644
--- a/Wrapping/Java/vtkJavaUtil.cxx
+++ b/Wrapping/Java/vtkJavaUtil.cxx
@@ -175,33 +175,6 @@ JNIEXPORT jarray vtkJavaMakeJArrayOfIntFromLongLong(JNIEnv *env, long long *ptr,
}
#endif
-#if defined(VTK_TYPE_USE___INT64)
-JNIEXPORT jarray vtkJavaMakeJArrayOfIntFrom__Int64(JNIEnv *env, __int64 *ptr, int size)
-{
- jintArray ret;
- int i;
- jint *array;
-
- ret = env->NewIntArray(size);
- if (ret == 0)
- {
- // should throw an exception here
- return 0;
- }
-
- array = env->GetIntArrayElements(ret,NULL);
-
- // copy the data
- for (i = 0; i < size; i++)
- {
- array[i] = (int)ptr[i];
- }
-
- env->ReleaseIntArrayElements(ret,array,0);
- return ret;
-}
-#endif
-
JNIEXPORT jarray vtkJavaMakeJArrayOfIntFromSignedChar(JNIEnv *env, signed char *ptr, int size)
{
jintArray ret;
diff --git a/Wrapping/Java/vtkJavaUtil.h b/Wrapping/Java/vtkJavaUtil.h
index 2683b89b85eeab990e134030981e736acb0dac2b..c6038f307daec8d844098cae6b3b8b4ab9682436 100644
--- a/Wrapping/Java/vtkJavaUtil.h
+++ b/Wrapping/Java/vtkJavaUtil.h
@@ -42,9 +42,6 @@ extern VTKWRAPPINGJAVA_EXPORT jarray vtkJavaMakeJArrayOfIntFromIdType(JNIEnv *en
#if defined(VTK_TYPE_USE_LONG_LONG)
extern VTKWRAPPINGJAVA_EXPORT jarray vtkJavaMakeJArrayOfIntFromLongLong(JNIEnv *env, long long *arr, int size);
#endif
-#if defined(VTK_TYPE_USE___INT64)
-extern VTKWRAPPINGJAVA_EXPORT jarray vtkJavaMakeJArrayOfIntFrom__Int64(JNIEnv *env, __int64 *arr, int size);
-#endif
extern VTKWRAPPINGJAVA_EXPORT jarray vtkJavaMakeJArrayOfIntFromSignedChar(JNIEnv *env, signed char *arr, int size);
extern VTKWRAPPINGJAVA_EXPORT jarray vtkJavaMakeJArrayOfLongFromLong(JNIEnv *env, long *arr, int size);
extern VTKWRAPPINGJAVA_EXPORT jarray vtkJavaMakeJArrayOfByteFromUnsignedChar(JNIEnv *env, unsigned char *arr, int size);
diff --git a/Wrapping/Python/vtk/util/vtkConstants.py b/Wrapping/Python/vtk/util/vtkConstants.py
index 6a751504a217127591efe97f7e2c1b16a57012a9..7541a47b2da4a1f546d1480c3abb090d7e6761ed 100644
--- a/Wrapping/Python/vtk/util/vtkConstants.py
+++ b/Wrapping/Python/vtk/util/vtkConstants.py
@@ -33,10 +33,10 @@ VTK_OPAQUE =14
VTK_LONG_LONG =16
VTK_UNSIGNED_LONG_LONG =17
-# This type is enabled if VTK_TYPE_USE___INT64 is defined.
+# Legacy. This type is never enabled.
VTK___INT64 =18
-# This type is enabled if VTK_TYPE_USE___INT64 is defined.
+# Legacy. This type is never enabled.
VTK_UNSIGNED___INT64 =19
# These types are required by vtkVariant and vtkVariantArray
diff --git a/Wrapping/Python/vtk/util/vtkVariant.py b/Wrapping/Python/vtk/util/vtkVariant.py
index bad0a64587811383b82a0b406a20dfba5664d7fa..e2a03f1055e6e2dcec1625340d36ba92c79494d8 100644
--- a/Wrapping/Python/vtk/util/vtkVariant.py
+++ b/Wrapping/Python/vtk/util/vtkVariant.py
@@ -18,8 +18,6 @@ _variant_type_map = {
'unsigned long' : vtk.VTK_UNSIGNED_LONG,
'long long' : vtk.VTK_LONG_LONG,
'unsigned long long' : vtk.VTK_UNSIGNED_LONG_LONG,
- '__int64' : vtk.VTK___INT64,
- 'unsigned __int64' : vtk.VTK_UNSIGNED___INT64,
'float' : vtk.VTK_FLOAT,
'double' : vtk.VTK_DOUBLE,
'string' : vtk.VTK_STRING,
@@ -41,8 +39,6 @@ _variant_method_map = {
vtk.VTK_UNSIGNED_LONG : 'ToUnsignedLong',
vtk.VTK_LONG_LONG : 'ToLongLong',
vtk.VTK_UNSIGNED_LONG_LONG : 'ToUnsignedLongLong',
- vtk.VTK___INT64 : 'To__Int64',
- vtk.VTK_UNSIGNED___INT64 : 'ToUnsigned__Int64',
vtk.VTK_FLOAT : 'ToFloat',
vtk.VTK_DOUBLE : 'ToDouble',
vtk.VTK_STRING : 'ToString',
diff --git a/Wrapping/PythonCore/vtkPythonArgs.cxx b/Wrapping/PythonCore/vtkPythonArgs.cxx
index 9cf38f28bf2dbe773f0eb4ce33e096fa48e2429b..db25fb61291d258272facf4c68d98f726bef277e 100644
--- a/Wrapping/PythonCore/vtkPythonArgs.cxx
+++ b/Wrapping/PythonCore/vtkPythonArgs.cxx
@@ -487,21 +487,6 @@ bool vtkPythonGetValue(PyObject *o, unsigned long long &a)
}
#endif
-#ifdef VTK_TYPE_USE___INT64
-inline
-bool vtkPythonGetValue(PyObject *o, __int64 &a)
-{
- return vtkPythonGetLongLongValue(o, a);
-}
-
-inline
-bool vtkPythonGetValue(PyObject *o, unsigned __int64 &a)
-{
- return vtkPythonGetUnsignedLongLongValue(o, i);
-}
-#endif
-
-
//--------------------------------------------------------------------
// Method for setting a C++ array from a Python sequence.
@@ -837,10 +822,6 @@ VTK_PYTHON_BUILD_TUPLE(unsigned long)
VTK_PYTHON_BUILD_TUPLE(long long)
VTK_PYTHON_BUILD_TUPLE(unsigned long long)
#endif
-#ifdef VTK_TYPE_USE___INT64
-VTK_PYTHON_BUILD_TUPLE(__int64)
-VTK_PYTHON_BUILD_TUPLE(unsigned __int64)
-#endif
//--------------------------------------------------------------------
// If "self" is a class, get real "self" from arg list
@@ -1047,10 +1028,6 @@ VTK_PYTHON_GET_ARG(unsigned long)
VTK_PYTHON_GET_ARG(long long)
VTK_PYTHON_GET_ARG(unsigned long long)
#endif
-#ifdef VTK_TYPE_USE___INT64
-VTK_PYTHON_GET_ARG(__int64)
-VTK_PYTHON_GET_ARG(unsigned __int64)
-#endif
//--------------------------------------------------------------------
// Define all the GetArray methods in the class.
@@ -1083,10 +1060,6 @@ VTK_PYTHON_GET_ARRAY_ARG(unsigned long)
VTK_PYTHON_GET_ARRAY_ARG(long long)
VTK_PYTHON_GET_ARRAY_ARG(unsigned long long)
#endif
-#ifdef VTK_TYPE_USE___INT64
-VTK_PYTHON_GET_ARRAY_ARG(__int64)
-VTK_PYTHON_GET_ARRAY_ARG(unsigned __int64)
-#endif
//--------------------------------------------------------------------
// Define all the GetNArray methods in the class.
@@ -1119,10 +1092,6 @@ VTK_PYTHON_GET_NARRAY_ARG(unsigned long)
VTK_PYTHON_GET_NARRAY_ARG(long long)
VTK_PYTHON_GET_NARRAY_ARG(unsigned long long)
#endif
-#ifdef VTK_TYPE_USE___INT64
-VTK_PYTHON_GET_NARRAY_ARG(__int64)
-VTK_PYTHON_GET_NARRAY_ARG(unsigned __int64)
-#endif
//--------------------------------------------------------------------
// Define the special function pointer GetValue method
@@ -1206,10 +1175,6 @@ VTK_PYTHON_SET_ARG(unsigned long)
VTK_PYTHON_SET_ARG(long long)
VTK_PYTHON_SET_ARG(unsigned long long)
#endif
-#ifdef VTK_TYPE_USE___INT64
-VTK_PYTHON_SET_ARG(__int64)
-VTK_PYTHON_SET_ARG(unsigned __int64)
-#endif
//--------------------------------------------------------------------
// Define all the SetArgValue methods for setting array args
@@ -1246,10 +1211,6 @@ VTK_PYTHON_SET_ARRAY_ARG(unsigned long)
VTK_PYTHON_SET_ARRAY_ARG(long long)
VTK_PYTHON_SET_ARRAY_ARG(unsigned long long)
#endif
-#ifdef VTK_TYPE_USE___INT64
-VTK_PYTHON_SET_ARRAY_ARG(__int64)
-VTK_PYTHON_SET_ARRAY_ARG(unsigned __int64)
-#endif
//--------------------------------------------------------------------
// Define all the SetArgValue methods for setting multi-dim array args
@@ -1287,10 +1248,6 @@ VTK_PYTHON_SET_NARRAY_ARG(unsigned long)
VTK_PYTHON_SET_NARRAY_ARG(long long)
VTK_PYTHON_SET_NARRAY_ARG(unsigned long long)
#endif
-#ifdef VTK_TYPE_USE___INT64
-VTK_PYTHON_SET_NARRAY_ARG(__int64)
-VTK_PYTHON_SET_NARRAY_ARG(unsigned __int64)
-#endif
//--------------------------------------------------------------------
// Raise an exception about incorrect arg count.
diff --git a/Wrapping/PythonCore/vtkPythonArgs.h b/Wrapping/PythonCore/vtkPythonArgs.h
index 8c804bc04693fe2851fca368a53d3da1419afbd6..40e4624ae55c761f5424ece4de2e1a08e668ab62 100644
--- a/Wrapping/PythonCore/vtkPythonArgs.h
+++ b/Wrapping/PythonCore/vtkPythonArgs.h
@@ -262,12 +262,6 @@ public:
bool GetValue(unsigned long long &v);
static bool GetValue(PyObject *o, unsigned long long &v);
#endif
-#ifdef VTK_TYPE_USE___INT64
- bool GetValue(__int64 &v);
- static bool GetValue(PyObject *o, __int64 &v);
- bool GetValue(unsigned __int64 &v);
- static bool GetValue(PyObject *o, unsigned __int64 &v);
-#endif
// Description:
// Get the next argument as an array.
@@ -287,10 +281,6 @@ public:
bool GetArray(long long *v, int n);
bool GetArray(unsigned long long *v, int n);
#endif
-#ifdef VTK_TYPE_USE___INT64
- bool GetArray(__int64 *v, int n);
- bool GetArray(unsigned __int64 *v, int n);
-#endif
// Description:
// Get the next argument as a multi-dimensional array.
@@ -310,10 +300,6 @@ public:
bool GetNArray(long long *v, int ndims, const int *dims);
bool GetNArray(unsigned long long *v, int ndims, const int *dims);
#endif
-#ifdef VTK_TYPE_USE___INT64
- bool GetNArray(__int64 *v, int ndims, const int *dims);
- bool GetNArray(unsigned __int64 *v, int ndims, const int *dims);
-#endif
// Description:
// Set the value of an argument if it is an assignable type.
@@ -335,10 +321,6 @@ public:
bool SetArgValue(int i, long long v);
bool SetArgValue(int i, unsigned long long v);
#endif
-#ifdef VTK_TYPE_USE___INT64
- bool SetArgValue(int i, __int64 v);
- bool SetArgValue(int i, unsigned __int64 v);
-#endif
// Description:
// Set the values in an array argument.
@@ -358,10 +340,6 @@ public:
bool SetArray(int i, const long long *v, int n);
bool SetArray(int i, const unsigned long long *v, int n);
#endif
-#ifdef VTK_TYPE_USE___INT64
- bool SetArray(int i, const __int64 *v, int n);
- bool SetArray(int i, const unsigned __int64 *v, int n);
-#endif
// Description:
// Set the values in a multi-dimensional array argument.
@@ -381,10 +359,6 @@ public:
bool SetNArray(int i, const long long *v, int n, const int *d);
bool SetNArray(int i, const unsigned long long *v, int n, const int *d);
#endif
-#ifdef VTK_TYPE_USE___INT64
- bool SetNArray(int i, const __int64 *v, int n, const int *d);
- bool SetNArray(int i, const unsigned __int64 *v, int n, const int *d);
-#endif
// Description:
// Build a value of None.
@@ -440,10 +414,6 @@ public:
static PyObject *BuildValue(long long v);
static PyObject *BuildValue(unsigned long long v);
#endif
-#ifdef VTK_TYPE_USE___INT64
- static PyObject *BuildValue(__int64 v);
- static PyObject *BuildValue(unsigned __int64 v);
-#endif
// Description:
// Build a bytes object (or string).
@@ -466,10 +436,6 @@ public:
static PyObject *BuildTuple(const long long *v, int n);
static PyObject *BuildTuple(const unsigned long long *v, int n);
#endif
-#ifdef VTK_TYPE_USE___INT64
- static PyObject *BuildTuple(const __int64 *v, int n);
- static PyObject *BuildTuple(const unsigned __int64 *v, int n);
-#endif
// Description:
// Copy an array.
@@ -827,20 +793,6 @@ PyObject *vtkPythonArgs::BuildValue(unsigned long long a)
}
#endif
-#if defined(VTK_TYPE_USE___INT64)
-inline
-PyObject *vtkPythonArgs::BuildValue(__int64 a)
-{
- return PyLong_FromLongLong(a);
-}
-
-inline
-PyObject *vtkPythonArgs::BuildValue(unsigned __int64 a)
-{
- return PyLong_FromUnsignedLongLong(a);
-}
-#endif
-
inline
PyObject *vtkPythonArgs::BuildBytes(const char *a, int n)
{
diff --git a/Wrapping/PythonCore/vtkPythonUtil.cxx b/Wrapping/PythonCore/vtkPythonUtil.cxx
index b4e990c5b2cb07a48dd97e7e498d2264859e6d1e..a3286d9d647d19037fa0eaacaa4f749b47d7fc72 100644
--- a/Wrapping/PythonCore/vtkPythonUtil.cxx
+++ b/Wrapping/PythonCore/vtkPythonUtil.cxx
@@ -739,9 +739,6 @@ PyObject *vtkPythonUtil::GetObjectFromObject(
#if defined(VTK_TYPE_USE_LONG_LONG)
unsigned long long l;
int i = sscanf(ptrText,"_%llx_%s", &l, typeCheck);
-#elif defined(VTK_TYPE_USE___INT64)
- unsigned __int64 l;
- int i = sscanf(ptrText,"_%I64x_%s", &l, typeCheck);
#else
unsigned long l;
int i = sscanf(ptrText,"_%lx_%s", &l, typeCheck);
@@ -752,8 +749,6 @@ PyObject *vtkPythonUtil::GetObjectFromObject(
{
#if defined(VTK_TYPE_USE_LONG_LONG)
i = sscanf(ptrText,"Addr=0x%llx", &l);
-#elif defined(VTK_TYPE_USE___INT64)
- i = sscanf(ptrText,"Addr=0x%I64x", &l);
#else
i = sscanf(ptrText,"Addr=0x%lx", &l);
#endif
@@ -980,9 +975,6 @@ char *vtkPythonUtil::ManglePointer(const void *ptr, const char *type)
#if defined(VTK_TYPE_USE_LONG_LONG)
sprintf(ptrText, "_%*.*llx_%s", ndigits, ndigits,
static_cast<unsigned long long>(u.l), type);
-#elif defined(VTK_TYPE_USE___INT64)
- sprintf(ptrText, "_%*.*I64x_%s", ndigits, ndigits,
- static_cast<unsigned __int64>(u.l), type);
#else
sprintf(ptrText, "_%*.*lx_%s", ndigits, ndigits,
static_cast<unsigned long>(u.l), type);
@@ -1024,9 +1016,6 @@ void *vtkPythonUtil::UnmanglePointer(char *ptrText, int *len, const char *type)
#if defined(VTK_TYPE_USE_LONG_LONG)
unsigned long long l;
i = sscanf(text, "_%llx_%s", &l ,typeCheck);
-#elif defined(VTK_TYPE_USE___INT64)
- unsigned __int64 l;
- i = sscanf(text, "_%I64x_%s", &l ,typeCheck);
#else
unsigned long l;
i = sscanf(text, "_%lx_%s", &l ,typeCheck);
diff --git a/Wrapping/Tools/hints b/Wrapping/Tools/hints
index 04e3b860049df06c96348007ddd491dc75ee788c..670750e18735a99989506b09fdc8450a0f585e26 100644
--- a/Wrapping/Tools/hints
+++ b/Wrapping/Tools/hints
@@ -125,7 +125,6 @@ vtkImplicitPlaneRepresentation GetNormal 307 3
vtkImplicitPlaneRepresentation GetOrigin 307 3
vtkImplicitPlaneWidget GetNormal 307 3
vtkImplicitPlaneWidget GetOrigin 307 3
-vtk__Int64Array GetValueRange 30C 2
vtkIntArray GetValueRange 304 2
vtkIOSRenderWindow GetPosition 304 2
vtkIOSRenderWindow GetScreenSize 304 2
@@ -253,7 +252,6 @@ vtkTypeInt64Array GetValueRange 30C 2
vtkTypeUInt64Array GetValueRange 31B 2
vtkTypeUInt64Array GetValueRange 31C 2
vtkUnsignedCharArray GetValueRange 313 2
-vtkUnsigned__Int64Array GetValueRange 31C 2
vtkUnsignedIntArray GetValueRange 314 2
vtkUnsignedLongArray GetValueRange 316 2
vtkUnsignedLongLongArray GetValueRange 31B 2
diff --git a/Wrapping/Tools/vtkParse.tab.c b/Wrapping/Tools/vtkParse.tab.c
index fd4ae18fea40ed7390194b60e8adab4c64797cfc..b9307cbfcb79100562f6dbcd6f65dcc49f471f09 100644
--- a/Wrapping/Tools/vtkParse.tab.c
+++ b/Wrapping/Tools/vtkParse.tab.c
@@ -11222,8 +11222,6 @@ unsigned int guess_constant_type(const char *valstring)
{
#if defined(VTK_TYPE_USE_LONG_LONG)
return VTK_PARSE_UNSIGNED_LONG_LONG;
-#elif defined(VTK_TYPE_USE___INT64)
- return VTK_PARSE_UNSIGNED___INT64;
#else
return VTK_PARSE_UNSIGNED_LONG;
#endif
@@ -11239,8 +11237,6 @@ unsigned int guess_constant_type(const char *valstring)
{
#if defined(VTK_TYPE_USE_LONG_LONG)
return VTK_PARSE_LONG_LONG;
-#elif defined(VTK_TYPE_USE___INT64)
- return VTK_PARSE___INT64;
#else
return VTK_PARSE_LONG;
#endif
diff --git a/Wrapping/Tools/vtkParse.y b/Wrapping/Tools/vtkParse.y
index 36782ff294c3231da2a41ce1bdfa7c1eeabee045..6c39801baf5392a99a54e742653ae5ca0c4e4631 100644
--- a/Wrapping/Tools/vtkParse.y
+++ b/Wrapping/Tools/vtkParse.y
@@ -3824,8 +3824,6 @@ unsigned int guess_constant_type(const char *valstring)
{
#if defined(VTK_TYPE_USE_LONG_LONG)
return VTK_PARSE_UNSIGNED_LONG_LONG;
-#elif defined(VTK_TYPE_USE___INT64)
- return VTK_PARSE_UNSIGNED___INT64;
#else
return VTK_PARSE_UNSIGNED_LONG;
#endif
@@ -3841,8 +3839,6 @@ unsigned int guess_constant_type(const char *valstring)
{
#if defined(VTK_TYPE_USE_LONG_LONG)
return VTK_PARSE_LONG_LONG;
-#elif defined(VTK_TYPE_USE___INT64)
- return VTK_PARSE___INT64;
#else
return VTK_PARSE_LONG;
#endif
diff --git a/Wrapping/Tools/vtkParseExtras.c b/Wrapping/Tools/vtkParseExtras.c
index cb7dcbc784431a049503757c9ee5b9586584db3a..c059e37be4216c756fe799516acacf7c26cb5e25 100644
--- a/Wrapping/Tools/vtkParseExtras.c
+++ b/Wrapping/Tools/vtkParseExtras.c
@@ -1774,9 +1774,6 @@ const char **vtkParse_GetTemplateMacroTypes()
"int", "unsigned int", "long", "unsigned long",
#ifdef VTK_TYPE_USE_LONG_LONG
"long long", "unsigned long long",
-#endif
-#ifdef VTK_TYPE_USE___INT64
- "__int64", "unsigned __int64",
#endif
"float", "double", NULL };
@@ -1791,9 +1788,6 @@ const char **vtkParse_GetArrayTypes()
"int", "unsigned int", "long", "unsigned long",
#ifdef VTK_TYPE_USE_LONG_LONG
"long long", "unsigned long long",
-#endif
-#ifdef VTK_TYPE_USE___INT64
- "__int64", "unsigned __int64",
#endif
"float", "double",
"vtkStdString", "vtkUnicodeString", "vtkVariant", NULL };
diff --git a/Wrapping/Tools/vtkWrapJava.c b/Wrapping/Tools/vtkWrapJava.c
index 8de2f38eda1d8ba09343d51c62078d47f0495d12..8f974b48319e79c7da9f40be1a1d25030d2c9015 100644
--- a/Wrapping/Tools/vtkWrapJava.c
+++ b/Wrapping/Tools/vtkWrapJava.c
@@ -145,11 +145,6 @@ void use_hints(FILE *fp)
MAX_ARGS, currentFunction->HintSize);
break;
- case VTK_PARSE___INT64_PTR:
- fprintf(fp," return vtkJavaMakeJArrayOfIntFrom__Int64(env,temp%i,%i);\n",
- MAX_ARGS, currentFunction->HintSize);
- break;
-
case VTK_PARSE_SIGNED_CHAR_PTR:
fprintf(fp," return vtkJavaMakeJArrayOfIntFromSignedChar(env,temp%i,%i);\n",
MAX_ARGS, currentFunction->HintSize);
diff --git a/Wrapping/Tools/vtkWrapPythonConstant.c b/Wrapping/Tools/vtkWrapPythonConstant.c
index b75a4329d591fb6f389529e652ca60c210d679ab..a911999f82b2722280fc693566eb4e787c320389 100644
--- a/Wrapping/Tools/vtkWrapPythonConstant.c
+++ b/Wrapping/Tools/vtkWrapPythonConstant.c
@@ -16,7 +16,7 @@
#include "vtkWrapPythonConstant.h"
#include "vtkWrap.h"
-/* for VTK_TYPE_USE_LONG_LONG vs VTK_TYPE_USE___INT64 */
+/* for VTK_TYPE_USE_LONG_LONG */
#include "vtkConfigure.h"
#include <stdio.h>
@@ -150,22 +150,6 @@ void vtkWrapPython_AddConstantHelper(
objcreated = 1;
break;
-#ifdef VTK_TYPE_USE___INT64
- case VTK_PARSE___INT64:
- fprintf(fp,
- "%s%s = PyLong_FromLongLong(%s);\n",
- indent, objvar, valstring);
- objcreated = 1;
- break;
-
- case VTK_PARSE_UNSIGNED___INT64:
- fprintf(fp,
- "%s%s = PyLong_FromUnsignedLongLong(%s);\n",
- indent, objvar, valstring);
- objcreated = 1;
- break;
-#endif
-
#ifdef VTK_TYPE_USE_LONG_LONG
case VTK_PARSE_LONG_LONG:
fprintf(fp,
diff --git a/Wrapping/Tools/vtkWrapPythonMethodDef.c b/Wrapping/Tools/vtkWrapPythonMethodDef.c
index 799996e34b8b54805bf4128a6a341f1340d179dc..1e9f43e1d553c6f0c197120e9b8605106c44cfee 100644
--- a/Wrapping/Tools/vtkWrapPythonMethodDef.c
+++ b/Wrapping/Tools/vtkWrapPythonMethodDef.c
@@ -455,9 +455,6 @@ static int vtkWrapPython_IsValueWrappable(
VTK_PARSE_UNKNOWN,
#ifdef VTK_TYPE_USE_LONG_LONG
VTK_PARSE_LONG_LONG, VTK_PARSE_UNSIGNED_LONG_LONG,
-#endif
-#ifdef VTK_TYPE_USE___INT64
- VTK_PARSE___INT64, VTK_PARSE_UNSIGNED___INT64,
#endif
VTK_PARSE_OBJECT, VTK_PARSE_QOBJECT, VTK_PARSE_STRING,
#ifndef VTK_PYTHON_NO_UNICODE
diff --git a/Wrapping/Tools/vtkWrapTcl.c b/Wrapping/Tools/vtkWrapTcl.c
index 04bf2bec3e992f8b933e362858901f8ece51faee..42997c8b7ee7c6faacadd93e80605d0ad69022dc 100644
--- a/Wrapping/Tools/vtkWrapTcl.c
+++ b/Wrapping/Tools/vtkWrapTcl.c
@@ -727,9 +727,6 @@ int checkFunctionSignature(ClassInfo *data)
VTK_PARSE_ID_TYPE, VTK_PARSE_UNSIGNED_ID_TYPE,
#ifdef VTK_TYPE_USE_LONG_LONG
VTK_PARSE_LONG_LONG, VTK_PARSE_UNSIGNED_LONG_LONG,
-#endif
-#ifdef VTK_TYPE_USE___INT64
- VTK_PARSE___INT64, VTK_PARSE_UNSIGNED___INT64,
#endif
VTK_PARSE_OBJECT, VTK_PARSE_STRING, VTK_PARSE_UNKNOWN,
0