Commit d24e6a9f authored by David Gobbi's avatar David Gobbi Committed by Marcus D. Hanwell
Browse files

COMP: use VTK_TYPE_USE_LONG_LONG instead of VTK_SIZEOF_LONG_LONG

parent b590c857
...@@ -534,7 +534,7 @@ static void vtkWrapPython_ReturnValue( ...@@ -534,7 +534,7 @@ static void vtkWrapPython_ReturnValue(
#endif #endif
/* support for "long long" depends on config and capabilities */ /* support for "long long" depends on config and capabilities */
#if defined(VTK_SIZEOF_LONG_LONG) #if defined(VTK_TYPE_USE_LONG_LONG)
# if defined(PY_LONG_LONG) && (VTK_SIZEOF_LONG != VTK_SIZEOF_LONG_LONG) # if defined(PY_LONG_LONG) && (VTK_SIZEOF_LONG != VTK_SIZEOF_LONG_LONG)
case VTK_PARSE_LONG_LONG: case VTK_PARSE_LONG_LONG:
{ {
...@@ -569,7 +569,7 @@ static void vtkWrapPython_ReturnValue( ...@@ -569,7 +569,7 @@ static void vtkWrapPython_ReturnValue(
#endif #endif
/* support for "__int64" depends on config and capabilities */ /* support for "__int64" depends on config and capabilities */
#if defined(VTK_SIZEOF___INT64) #if defined(VTK_TYPE_USE___INT64)
# if defined(PY_LONG_LONG) && (VTK_SIZEOF_LONG != VTK_SIZEOF___INT64) # if defined(PY_LONG_LONG) && (VTK_SIZEOF_LONG != VTK_SIZEOF___INT64)
case VTK_PARSE___INT64: case VTK_PARSE___INT64:
{ {
...@@ -2198,11 +2198,11 @@ static int vtkWrapPython_MethodCheck( ...@@ -2198,11 +2198,11 @@ static int vtkWrapPython_MethodCheck(
if (argType == VTK_PARSE_UNSIGNED___INT64_PTR) args_ok = 0; if (argType == VTK_PARSE_UNSIGNED___INT64_PTR) args_ok = 0;
if (argType == VTK_PARSE_UNSIGNED_SHORT_PTR) args_ok = 0; if (argType == VTK_PARSE_UNSIGNED_SHORT_PTR) args_ok = 0;
if (argType == VTK_PARSE_UNSIGNED_LONG_PTR) args_ok = 0; if (argType == VTK_PARSE_UNSIGNED_LONG_PTR) args_ok = 0;
#ifndef VTK_SIZEOF___INT64 #ifndef VTK_TYPE_USE___INT64
if (argType == VTK_PARSE___INT64) args_ok = 0; if (argType == VTK_PARSE___INT64) args_ok = 0;
if (argType == VTK_PARSE_UNSIGNED___INT64) args_ok = 0; if (argType == VTK_PARSE_UNSIGNED___INT64) args_ok = 0;
#endif #endif
#ifndef VTK_SIZEOF_LONG_LONG #ifndef VTK_TYPE_USE_LONG_LONG
if (argType == VTK_PARSE_LONG_LONG) args_ok = 0; if (argType == VTK_PARSE_LONG_LONG) args_ok = 0;
if (argType == VTK_PARSE_UNSIGNED_LONG_LONG) args_ok = 0; if (argType == VTK_PARSE_UNSIGNED_LONG_LONG) args_ok = 0;
#endif #endif
...@@ -2247,11 +2247,11 @@ static int vtkWrapPython_MethodCheck( ...@@ -2247,11 +2247,11 @@ static int vtkWrapPython_MethodCheck(
if (returnType == VTK_PARSE_UNSIGNED_LONG_PTR) args_ok = 0; if (returnType == VTK_PARSE_UNSIGNED_LONG_PTR) args_ok = 0;
/* eliminate types that aren't supported by the compiler */ /* eliminate types that aren't supported by the compiler */
#ifndef VTK_SIZEOF___INT64 #ifndef VTK_TYPE_USE___INT64
if (returnType == VTK_PARSE___INT64) args_ok = 0; if (returnType == VTK_PARSE___INT64) args_ok = 0;
if (returnType == VTK_PARSE_UNSIGNED___INT64) args_ok = 0; if (returnType == VTK_PARSE_UNSIGNED___INT64) args_ok = 0;
#endif #endif
#ifndef VTK_SIZEOF_LONG_LONG #ifndef VTK_TYPE_USE_LONG_LONG
if (returnType == VTK_PARSE_LONG_LONG) args_ok = 0; if (returnType == VTK_PARSE_LONG_LONG) args_ok = 0;
if (returnType == VTK_PARSE_UNSIGNED_LONG_LONG) args_ok = 0; if (returnType == VTK_PARSE_UNSIGNED_LONG_LONG) args_ok = 0;
#endif #endif
......
...@@ -678,13 +678,13 @@ void outputFunction(FILE *fp, FileInfo *data) ...@@ -678,13 +678,13 @@ void outputFunction(FILE *fp, FileInfo *data)
{ {
if ((currentFunction->ArgTypes[i] & VTK_PARSE_BASE_TYPE) if ((currentFunction->ArgTypes[i] & VTK_PARSE_BASE_TYPE)
== VTK_PARSE_UNKNOWN) args_ok = 0; == VTK_PARSE_UNKNOWN) args_ok = 0;
#ifndef VTK_SIZEOF_LONG_LONG #ifndef VTK_TYPE_USE_LONG_LONG
if ((currentFunction->ArgTypes[i] & VTK_PARSE_BASE_TYPE) if ((currentFunction->ArgTypes[i] & VTK_PARSE_BASE_TYPE)
== VTK_PARSE_LONG_LONG || == VTK_PARSE_LONG_LONG ||
(currentFunction->ArgTypes[i] & VTK_PARSE_BASE_TYPE) (currentFunction->ArgTypes[i] & VTK_PARSE_BASE_TYPE)
== VTK_PARSE_UNSIGNED_LONG_LONG) args_ok = 0; == VTK_PARSE_UNSIGNED_LONG_LONG) args_ok = 0;
#endif #endif
#ifndef VTK_SIZEOF___INT64 #ifndef VTK_TYPE_USE___INT64
if ((currentFunction->ArgTypes[i] & VTK_PARSE_BASE_TYPE) if ((currentFunction->ArgTypes[i] & VTK_PARSE_BASE_TYPE)
== VTK_PARSE___INT64 || == VTK_PARSE___INT64 ||
(currentFunction->ArgTypes[i] & VTK_PARSE_BASE_TYPE) (currentFunction->ArgTypes[i] & VTK_PARSE_BASE_TYPE)
...@@ -731,13 +731,13 @@ void outputFunction(FILE *fp, FileInfo *data) ...@@ -731,13 +731,13 @@ void outputFunction(FILE *fp, FileInfo *data)
} }
if ((currentFunction->ReturnType & VTK_PARSE_BASE_TYPE) == if ((currentFunction->ReturnType & VTK_PARSE_BASE_TYPE) ==
VTK_PARSE_UNKNOWN) args_ok = 0; VTK_PARSE_UNKNOWN) args_ok = 0;
#ifndef VTK_SIZEOF_LONG_LONG #ifndef VTK_TYPE_USE_LONG_LONG
if ((currentFunction->ReturnType & VTK_PARSE_BASE_TYPE) == if ((currentFunction->ReturnType & VTK_PARSE_BASE_TYPE) ==
VTK_PARSE_LONG_LONG || VTK_PARSE_LONG_LONG ||
(currentFunction->ReturnType & VTK_PARSE_BASE_TYPE) == (currentFunction->ReturnType & VTK_PARSE_BASE_TYPE) ==
VTK_PARSE_UNSIGNED_LONG_LONG) args_ok = 0; VTK_PARSE_UNSIGNED_LONG_LONG) args_ok = 0;
#endif #endif
#ifndef VTK_SIZEOF___INT64 #ifndef VTK_TYPE_USE___INT64
if ((currentFunction->ReturnType & VTK_PARSE_BASE_TYPE) == if ((currentFunction->ReturnType & VTK_PARSE_BASE_TYPE) ==
VTK_PARSE___INT64 || VTK_PARSE___INT64 ||
(currentFunction->ReturnType & VTK_PARSE_BASE_TYPE) == (currentFunction->ReturnType & VTK_PARSE_BASE_TYPE) ==
......
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