Commit 152e7f45 authored by Sean McBride's avatar Sean McBride

Remove double underscore in header guards (__vtk*_cxx form)

Used the following command:

find . -type f -exec perl -pi -w -e 's/__vtk(.*)_cxx/vtk$1_cxx/g;' {} \;

Fixes many, but not all, clang -Wreserved-id-macro warnings.

Change-Id: I402387e6d034f3f30bfc518768f34f6c73f2ea15
parent 7cef24ea
......@@ -19,7 +19,7 @@ VTK_DATA_ARRAY_TEMPLATE_INSTANTIATE(char);
#include "vtkArrayIteratorTemplate.txx"
VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(char);
#define __vtkCharArray_cxx
#define vtkCharArray_cxx
#include "vtkCharArray.h"
#include "vtkObjectFactory.h"
......
......@@ -22,7 +22,7 @@
#define __vtkCharArray_h
// Tell the template header how to give our superclass a DLL interface.
#if !defined(__vtkCharArray_cxx)
#if !defined(vtkCharArray_cxx)
# define VTK_DATA_ARRAY_TEMPLATE_TYPE char
#endif
......
......@@ -19,7 +19,7 @@ VTK_DATA_ARRAY_TEMPLATE_INSTANTIATE(double);
#include "vtkArrayIteratorTemplate.txx"
VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(double);
#define __vtkDoubleArray_cxx
#define vtkDoubleArray_cxx
#include "vtkDoubleArray.h"
#include "vtkObjectFactory.h"
......
......@@ -22,7 +22,7 @@
#define __vtkDoubleArray_h
// Tell the template header how to give our superclass a DLL interface.
#if !defined(__vtkDoubleArray_cxx)
#if !defined(vtkDoubleArray_cxx)
# define VTK_DATA_ARRAY_TEMPLATE_TYPE double
#endif
......
......@@ -19,7 +19,7 @@ VTK_DATA_ARRAY_TEMPLATE_INSTANTIATE(float);
#include "vtkArrayIteratorTemplate.txx"
VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(float);
#define __vtkFloatArray_cxx
#define vtkFloatArray_cxx
#include "vtkFloatArray.h"
#include "vtkObjectFactory.h"
......
......@@ -22,7 +22,7 @@
#define __vtkFloatArray_h
// Tell the template header how to give our superclass a DLL interface.
#if !defined(__vtkFloatArray_cxx)
#if !defined(vtkFloatArray_cxx)
# define VTK_DATA_ARRAY_TEMPLATE_TYPE float
#endif
......
......@@ -21,7 +21,7 @@
// #include "vtkArrayIteratorTemplate.txx"
// VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(vtkIdType);
#define __vtkIdTypeArray_cxx
#define vtkIdTypeArray_cxx
#include "vtkIdTypeArray.h"
#include "vtkObjectFactory.h"
......
......@@ -22,7 +22,7 @@
#define __vtkIdTypeArray_h
// Tell the template header how to give our superclass a DLL interface.
#if !(defined(__vtkIdTypeArray_cxx) && defined(VTK_USE_64BIT_IDS)) && (defined(VTK_USE_64BIT_IDS) || !defined(__vtkIntArray_h))
#if !(defined(vtkIdTypeArray_cxx) && defined(VTK_USE_64BIT_IDS)) && (defined(VTK_USE_64BIT_IDS) || !defined(__vtkIntArray_h))
# define VTK_DATA_ARRAY_TEMPLATE_TYPE vtkIdType
#endif
......
......@@ -19,7 +19,7 @@ VTK_DATA_ARRAY_TEMPLATE_INSTANTIATE(int);
#include "vtkArrayIteratorTemplate.txx"
VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(int);
#define __vtkIntArray_cxx
#define vtkIntArray_cxx
#include "vtkIntArray.h"
#include "vtkObjectFactory.h"
......
......@@ -22,7 +22,7 @@
#define __vtkIntArray_h
// Tell the template header how to give our superclass a DLL interface.
#if !defined(__vtkIntArray_cxx) && (defined(VTK_USE_64BIT_IDS) || !defined(__vtkIdTypeArray_h))
#if !defined(vtkIntArray_cxx) && (defined(VTK_USE_64BIT_IDS) || !defined(__vtkIdTypeArray_h))
# define VTK_DATA_ARRAY_TEMPLATE_TYPE int
#endif
......
......@@ -19,7 +19,7 @@ VTK_DATA_ARRAY_TEMPLATE_INSTANTIATE(long);
#include "vtkArrayIteratorTemplate.txx"
VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(long);
#define __vtkLongArray_cxx
#define vtkLongArray_cxx
#include "vtkLongArray.h"
#include "vtkObjectFactory.h"
......
......@@ -22,7 +22,7 @@
#define __vtkLongArray_h
// Tell the template header how to give our superclass a DLL interface.
#if !defined(__vtkLongArray_cxx)
#if !defined(vtkLongArray_cxx)
# define VTK_DATA_ARRAY_TEMPLATE_TYPE long
#endif
......
......@@ -18,7 +18,7 @@ VTK_DATA_ARRAY_TEMPLATE_INSTANTIATE(long long);
#include "vtkArrayIteratorTemplate.txx"
VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(long long);
#define __vtkLongLongArray_cxx
#define vtkLongLongArray_cxx
#include "vtkLongLongArray.h"
#include "vtkObjectFactory.h"
......
......@@ -22,7 +22,7 @@
#define __vtkLongLongArray_h
// Tell the template header how to give our superclass a DLL interface.
#if !defined(__vtkLongLongArray_cxx)
#if !defined(vtkLongLongArray_cxx)
# define VTK_DATA_ARRAY_TEMPLATE_TYPE long long
#endif
......
......@@ -18,7 +18,7 @@ VTK_DATA_ARRAY_TEMPLATE_INSTANTIATE(short);
#include "vtkArrayIteratorTemplate.txx"
VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(short);
#define __vtkShortArray_cxx
#define vtkShortArray_cxx
#include "vtkShortArray.h"
#include "vtkObjectFactory.h"
......
......@@ -22,7 +22,7 @@
#define __vtkShortArray_h
// Tell the template header how to give our superclass a DLL interface.
#if !defined(__vtkShortArray_cxx)
#if !defined(vtkShortArray_cxx)
# define VTK_DATA_ARRAY_TEMPLATE_TYPE short
#endif
......
......@@ -18,7 +18,7 @@ VTK_DATA_ARRAY_TEMPLATE_INSTANTIATE(signed char);
#include "vtkArrayIteratorTemplate.txx"
VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(signed char);
#define __vtkSignedCharArray_cxx
#define vtkSignedCharArray_cxx
#include "vtkSignedCharArray.h"
#include "vtkObjectFactory.h"
......
......@@ -22,7 +22,7 @@
#define __vtkSignedCharArray_h
// Tell the template header how to give our superclass a DLL interface.
#if !defined(__vtkSignedCharArray_cxx)
#if !defined(vtkSignedCharArray_cxx)
# define VTK_DATA_ARRAY_TEMPLATE_TYPE signed char
#endif
......
......@@ -18,7 +18,7 @@ VTK_DATA_ARRAY_TEMPLATE_INSTANTIATE(unsigned char);
#include "vtkArrayIteratorTemplate.txx"
VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(unsigned char);
#define __vtkUnsignedCharArray_cxx
#define vtkUnsignedCharArray_cxx
#include "vtkUnsignedCharArray.h"
#include "vtkObjectFactory.h"
......
......@@ -22,7 +22,7 @@
#define __vtkUnsignedCharArray_h
// Tell the template header how to give our superclass a DLL interface.
#if !defined(__vtkUnsignedCharArray_cxx)
#if !defined(vtkUnsignedCharArray_cxx)
# define VTK_DATA_ARRAY_TEMPLATE_TYPE unsigned char
#endif
......
......@@ -18,7 +18,7 @@ VTK_DATA_ARRAY_TEMPLATE_INSTANTIATE(unsigned int);
#include "vtkArrayIteratorTemplate.txx"
VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(unsigned int);
#define __vtkUnsignedIntArray_cxx
#define vtkUnsignedIntArray_cxx
#include "vtkUnsignedIntArray.h"
#include "vtkObjectFactory.h"
......
......@@ -22,7 +22,7 @@
#define __vtkUnsignedIntArray_h
// Tell the template header how to give our superclass a DLL interface.
#if !defined(__vtkUnsignedIntArray_cxx)
#if !defined(vtkUnsignedIntArray_cxx)
# define VTK_DATA_ARRAY_TEMPLATE_TYPE unsigned int
#endif
......
......@@ -18,7 +18,7 @@ VTK_DATA_ARRAY_TEMPLATE_INSTANTIATE(unsigned long);
#include "vtkArrayIteratorTemplate.txx"
VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(unsigned long);
#define __vtkUnsignedLongArray_cxx
#define vtkUnsignedLongArray_cxx
#include "vtkUnsignedLongArray.h"
#include "vtkObjectFactory.h"
......
......@@ -22,7 +22,7 @@
#define __vtkUnsignedLongArray_h
// Tell the template header how to give our superclass a DLL interface.
#if !defined(__vtkUnsignedLongArray_cxx)
#if !defined(vtkUnsignedLongArray_cxx)
# define VTK_DATA_ARRAY_TEMPLATE_TYPE unsigned long
#endif
......
......@@ -19,7 +19,7 @@ VTK_DATA_ARRAY_TEMPLATE_INSTANTIATE(unsigned long long);
VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(unsigned long long);
#define __vtkUnsignedLongLongArray_cxx
#define vtkUnsignedLongLongArray_cxx
#include "vtkUnsignedLongLongArray.h"
#include "vtkObjectFactory.h"
......
......@@ -22,7 +22,7 @@
#define __vtkUnsignedLongLongArray_h
// Tell the template header how to give our superclass a DLL interface.
#if !defined(__vtkUnsignedLongLongArray_cxx)
#if !defined(vtkUnsignedLongLongArray_cxx)
# define VTK_DATA_ARRAY_TEMPLATE_TYPE unsigned long long
#endif
......
......@@ -18,7 +18,7 @@ VTK_DATA_ARRAY_TEMPLATE_INSTANTIATE(unsigned short);
#include "vtkArrayIteratorTemplate.txx"
VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(unsigned short);
#define __vtkUnsignedShortArray_cxx
#define vtkUnsignedShortArray_cxx
#include "vtkUnsignedShortArray.h"
#include "vtkObjectFactory.h"
......
......@@ -22,7 +22,7 @@
#define __vtkUnsignedShortArray_h
// Tell the template header how to give our superclass a DLL interface.
#if !defined(__vtkUnsignedShortArray_cxx)
#if !defined(vtkUnsignedShortArray_cxx)
# define VTK_DATA_ARRAY_TEMPLATE_TYPE unsigned short
#endif
......
......@@ -18,7 +18,7 @@ VTK_DATA_ARRAY_TEMPLATE_INSTANTIATE(unsigned __int64);
#include "vtkArrayIteratorTemplate.txx"
VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(unsigned __int64);
#define __vtkUnsigned__Int64Array_cxx
#define vtkUnsigned__Int64Array_cxx
#include "vtkUnsigned__Int64Array.h"
#include "vtkObjectFactory.h"
......
......@@ -22,7 +22,7 @@
#define __vtkUnsigned__Int64Array_h
// Tell the template header how to give our superclass a DLL interface.
#if !defined(__vtkUnsigned__Int64Array_cxx)
#if !defined(vtkUnsigned__Int64Array_cxx)
# define VTK_DATA_ARRAY_TEMPLATE_TYPE unsigned __int64
#endif
......
......@@ -19,7 +19,7 @@ VTK_DATA_ARRAY_TEMPLATE_INSTANTIATE(__int64);
#include "vtkArrayIteratorTemplate.txx"
VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(__int64);
#define __vtk__Int64Array_cxx
#define vtk__Int64Array_cxx
#include "vtk__Int64Array.h"
#include "vtkObjectFactory.h"
......
......@@ -22,7 +22,7 @@
#define __vtk__Int64Array_h
// Tell the template header how to give our superclass a DLL interface.
#if !defined(__vtk__Int64Array_cxx)
#if !defined(vtk__Int64Array_cxx)
# define VTK_DATA_ARRAY_TEMPLATE_TYPE __int64
#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