Commit 7cef24ea authored by Sean McBride's avatar Sean McBride
Browse files

Remove double underscore in header guards (.in & __vtk*_h form)

Used the following command:

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

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

Change-Id: I86db91ad530c203347f2b0dfd29c31f843c3f2b7
parent 6dce5106
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information. PURPOSE. See the above copyright notice for more information.
=========================================================================*/ =========================================================================*/
#ifndef __vtkDaxConfig_h #ifndef vtkDaxConfig_h
#define __vtkDaxConfig_h #define vtkDaxConfig_h
// Boost gives a bunch of warnings with nvcc if you don't specify how shared // Boost gives a bunch of warnings with nvcc if you don't specify how shared
// pointers should handle threads. Dax does not care (it is too careful about // pointers should handle threads. Dax does not care (it is too careful about
...@@ -38,4 +38,4 @@ ...@@ -38,4 +38,4 @@
#include <dax/internal/Configure.h> #include <dax/internal/Configure.h>
#include <dax/cont/DeviceAdapter.h> #include <dax/cont/DeviceAdapter.h>
#endif // __vtkDaxConfig_h #endif // vtkDaxConfig_h
...@@ -70,8 +70,8 @@ ...@@ -70,8 +70,8 @@
// iterate over them together, use a struct or class to group them together // iterate over them together, use a struct or class to group them together
// and use a thread local of that class. // and use a thread local of that class.
#ifndef __vtkSMPThreadLocal_h #ifndef vtkSMPThreadLocal_h
#define __vtkSMPThreadLocal_h #define vtkSMPThreadLocal_h
#include "vtkSystemIncludes.h" #include "vtkSystemIncludes.h"
#include <vector> #include <vector>
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
// platform or compiler, mutexes, which are significantly slower, are used // platform or compiler, mutexes, which are significantly slower, are used
// as a fallback. // as a fallback.
#ifndef __vtkAtomicInt_h #ifndef vtkAtomicInt_h
#define __vtkAtomicInt_h #define vtkAtomicInt_h
#include "vtkCommonCoreModule.h" // For export macro #include "vtkCommonCoreModule.h" // For export macro
#include "vtkSystemIncludes.h" #include "vtkSystemIncludes.h"
......
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
// Note that this particular implementation is designed to work in sequential // Note that this particular implementation is designed to work in sequential
// mode and supports only 1 thread. // mode and supports only 1 thread.
#ifndef __vtkSMPThreadLocal_h #ifndef vtkSMPThreadLocal_h
#define __vtkSMPThreadLocal_h #define vtkSMPThreadLocal_h
#include "vtkSystemIncludes.h" #include "vtkSystemIncludes.h"
#include <vector> #include <vector>
......
...@@ -73,8 +73,8 @@ ...@@ -73,8 +73,8 @@
// iterate over them together, use a struct or class to group them together // iterate over them together, use a struct or class to group them together
// and use a thread local of that class. // and use a thread local of that class.
#ifndef __vtkSMPThreadLocal_h #ifndef vtkSMPThreadLocal_h
#define __vtkSMPThreadLocal_h #define vtkSMPThreadLocal_h
#include "vtkCommonCoreModule.h" // For export macro #include "vtkCommonCoreModule.h" // For export macro
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
// .NAME vtkAtomicInt - // .NAME vtkAtomicInt -
// .SECTION Description // .SECTION Description
#ifndef __vtkAtomicInt_h #ifndef vtkAtomicInt_h
#define __vtkAtomicInt_h #define vtkAtomicInt_h
#include <tbb/atomic.h> #include <tbb/atomic.h>
......
...@@ -70,8 +70,8 @@ ...@@ -70,8 +70,8 @@
// iterate over them together, use a struct or class to group them together // iterate over them together, use a struct or class to group them together
// and use a thread local of that class. // and use a thread local of that class.
#ifndef __vtkSMPThreadLocal_h #ifndef vtkSMPThreadLocal_h
#define __vtkSMPThreadLocal_h #define vtkSMPThreadLocal_h
#include <tbb/enumerable_thread_specific.h> #include <tbb/enumerable_thread_specific.h>
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information. PURPOSE. See the above copyright notice for more information.
=========================================================================*/ =========================================================================*/
#ifndef __vtkConfigure_h #ifndef vtkConfigure_h
#define __vtkConfigure_h #define vtkConfigure_h
/* This header is configured by VTK's build process. */ /* This header is configured by VTK's build process. */
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
=========================================================================*/ =========================================================================*/
#ifndef __vtkFloatingPointExceptionsConfigure_h #ifndef vtkFloatingPointExceptionsConfigure_h
#define __vtkFloatingPointExceptionsConfigure_h #define vtkFloatingPointExceptionsConfigure_h
#cmakedefine VTK_HAS_FEENABLEEXCEPT #cmakedefine VTK_HAS_FEENABLEEXCEPT
...@@ -24,4 +24,4 @@ ...@@ -24,4 +24,4 @@
# define VTK_USE_FENV 1 # define VTK_USE_FENV 1
#endif #endif
#endif //__vtkFloatingPointExceptionsConfigure_h #endif //vtkFloatingPointExceptionsConfigure_h
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
See Copyright.txt or http://www.paraview.org/HTML/Copyright.html for details. See Copyright.txt or http://www.paraview.org/HTML/Copyright.html for details.
----------------------------------------------------------------------------*/ ----------------------------------------------------------------------------*/
#ifndef __vtkMathConfigure_h #ifndef vtkMathConfigure_h
#define __vtkMathConfigure_h #define vtkMathConfigure_h
#include <cmath> #include <cmath>
#include <float.h> // for _isnan, _finite on Win32 #include <float.h> // for _isnan, _finite on Win32
...@@ -100,4 +100,4 @@ ...@@ -100,4 +100,4 @@
# define VTK_NON_FINITE_CAUSES_EXCEPTIONS # define VTK_NON_FINITE_CAUSES_EXCEPTIONS
#endif #endif
#endif //__vtkMathConfigure_h #endif //vtkMathConfigure_h
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information. PURPOSE. See the above copyright notice for more information.
=========================================================================*/ =========================================================================*/
#ifndef __vtkToolkits_h #ifndef vtkToolkits_h
#define __vtkToolkits_h #define vtkToolkits_h
/* This header is configured by VTK's build process. */ /* This header is configured by VTK's build process. */
......
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
// provides methods for insertion and retrieval of values and will // provides methods for insertion and retrieval of values and will
// automatically resize itself to hold new data. // automatically resize itself to hold new data.
#ifndef __vtkType@VTK_TYPE_NAME@Array_h #ifndef vtkType@VTK_TYPE_NAME@Array_h
#define __vtkType@VTK_TYPE_NAME@Array_h #define vtkType@VTK_TYPE_NAME@Array_h
#include "vtkCommonCoreModule.h" // For export macro #include "vtkCommonCoreModule.h" // For export macro
#include "vtk@VTK_TYPE_NATIVE@Array.h" #include "vtk@VTK_TYPE_NATIVE@Array.h"
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information. PURPOSE. See the above copyright notice for more information.
=========================================================================*/ =========================================================================*/
#ifndef __vtkVersionMacros_h #ifndef vtkVersionMacros_h
#define __vtkVersionMacros_h #define vtkVersionMacros_h
/* In development versions the minor component is odd and the build /* In development versions the minor component is odd and the build
component encodes a date in CCYYMMDD format. In release versions component encodes a date in CCYYMMDD format. In release versions
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
=========================================================================*/ =========================================================================*/
#ifndef __vtkDomainsChemistryConfigure_h #ifndef vtkDomainsChemistryConfigure_h
#define __vtkDomainsChemistryConfigure_h #define vtkDomainsChemistryConfigure_h
/* Where the Blue Obelisk Data Repository files are installed */ /* Where the Blue Obelisk Data Repository files are installed */
#define VTK_BODR_DATA_PATH "@CMAKE_INSTALL_PREFIX@/@VTK_INSTALL_DATA_DIR@/vtkDomainsChemistry" #define VTK_BODR_DATA_PATH "@CMAKE_INSTALL_PREFIX@/@VTK_INSTALL_DATA_DIR@/vtkDomainsChemistry"
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
=========================================================================*/ =========================================================================*/
#ifndef __vtkFiltersStatisticsGnuRConfigure_h #ifndef vtkFiltersStatisticsGnuRConfigure_h
#define __vtkFiltersStatisticsGnuRConfigure_h #define vtkFiltersStatisticsGnuRConfigure_h
/* Set the whether we have UINTPTR_T defined in support of the GNU R interface */ /* Set the whether we have UINTPTR_T defined in support of the GNU R interface */
#cmakedefine HAVE_VTK_UINTPTR_T #cmakedefine HAVE_VTK_UINTPTR_T
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
=========================================================================*/ =========================================================================*/
#ifndef __vtkMFCConfigure_h #ifndef vtkMFCConfigure_h
#define __vtkMFCConfigure_h #define vtkMFCConfigure_h
#include "vtkConfigure.h" #include "vtkConfigure.h"
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information. PURPOSE. See the above copyright notice for more information.
=========================================================================*/ =========================================================================*/
#ifndef __vtkFFMPEGConfig_h #ifndef vtkFFMPEGConfig_h
#define __vtkFFMPEGConfig_h #define vtkFFMPEGConfig_h
/* This header is configured by VTK's build process. */ /* This header is configured by VTK's build process. */
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information. PURPOSE. See the above copyright notice for more information.
=========================================================================*/ =========================================================================*/
#ifndef __vtkIOMovieConfigure_h #ifndef vtkIOMovieConfigure_h
#define __vtkIOMovieConfigure_h #define vtkIOMovieConfigure_h
/* This header contains build settings for the vtkIOMovie module */ /* This header contains build settings for the vtkIOMovie module */
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
=========================================================================*/ =========================================================================*/
#ifndef __vtkIOMySQLTestingCxxConfigure_h #ifndef vtkIOMySQLTestingCxxConfigure_h
#define __vtkIOMySQLTestingCxxConfigure_h #define vtkIOMySQLTestingCxxConfigure_h
#cmakedefine VTK_MYSQL_TEST_URL #cmakedefine VTK_MYSQL_TEST_URL
#ifdef VTK_MYSQL_TEST_URL #ifdef VTK_MYSQL_TEST_URL
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
=========================================================================*/ =========================================================================*/
#ifndef __vtkIOODBCTestingCxxConfigure_h #ifndef vtkIOODBCTestingCxxConfigure_h
#define __vtkIOODBCTestingCxxConfigure_h #define vtkIOODBCTestingCxxConfigure_h
#cmakedefine VTK_ODBC_TEST_DSN #cmakedefine VTK_ODBC_TEST_DSN
#ifdef VTK_ODBC_TEST_DSN #ifdef VTK_ODBC_TEST_DSN
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
=========================================================================*/ =========================================================================*/
#ifndef __vtkIOPostgresSQLTestingCxxConfigure_h #ifndef vtkIOPostgresSQLTestingCxxConfigure_h
#define __vtkIOPostgresSQLTestingCxxConfigure_h #define vtkIOPostgresSQLTestingCxxConfigure_h
#cmakedefine VTK_PSQL_TEST_URL #cmakedefine VTK_PSQL_TEST_URL
#ifdef VTK_PSQL_TEST_URL #ifdef VTK_PSQL_TEST_URL
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information. PURPOSE. See the above copyright notice for more information.
=========================================================================*/ =========================================================================*/
#ifndef __vtkOpenGLError_h #ifndef vtkOpenGLError_h
#define __vtkOpenGLError_h #define vtkOpenGLError_h
#include "vtkgl.h" #include "vtkgl.h"
#include "vtkSetGet.h" #include "vtkSetGet.h"
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
=========================================================================*/ =========================================================================*/
#ifndef __vtkRenderingOpenGLConfigure_h #ifndef vtkRenderingOpenGLConfigure_h
#define __vtkRenderingOpenGLConfigure_h #define vtkRenderingOpenGLConfigure_h
/* This header contains build settings for the vtkRenderingOpenGL module. */ /* This header contains build settings for the vtkRenderingOpenGL module. */
......
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
=========================================================================*/ =========================================================================*/
#ifndef __vtkTDxConfigure_h #ifndef vtkTDxConfigure_h
#define __vtkTDxConfigure_h #define vtkTDxConfigure_h
/* Whether the 3Dconnexion devices are being used */ /* Whether the 3Dconnexion devices are being used */
#cmakedefine VTK_USE_TDX #cmakedefine VTK_USE_TDX
#endif /* __vtkTDxConfigure_h */ #endif /* vtkTDxConfigure_h */
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information. PURPOSE. See the above copyright notice for more information.
=========================================================================*/ =========================================================================*/
#ifndef __vtkOpenGLError_h #ifndef vtkOpenGLError_h
#define __vtkOpenGLError_h #define vtkOpenGLError_h
#include "vtkSetGet.h" #include "vtkSetGet.h"
#include "vtk_glew.h" #include "vtk_glew.h"
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
=========================================================================*/ =========================================================================*/
#ifndef __vtkRenderingOpenGLConfigure_h #ifndef vtkRenderingOpenGLConfigure_h
#define __vtkRenderingOpenGLConfigure_h #define vtkRenderingOpenGLConfigure_h
/* This header contains build settings for the vtkRenderingOpenGL2 module. */ /* This header contains build settings for the vtkRenderingOpenGL2 module. */
/* It provides some compatibility with the vtkRenderingOpenGL module. */ /* It provides some compatibility with the vtkRenderingOpenGL module. */
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
=========================================================================*/ =========================================================================*/
#ifndef __vtkTkInternals_h #ifndef vtkTkInternals_h
#define __vtkTkInternals_h #define vtkTkInternals_h
#include "vtkRenderingOpenGLConfigure.h" // for COCOA, CARBON, X11, WIN32 #include "vtkRenderingOpenGLConfigure.h" // for COCOA, CARBON, X11, WIN32
...@@ -48,5 +48,5 @@ extern "C" ...@@ -48,5 +48,5 @@ extern "C"
#include "tkMacOSXInt.h" #include "tkMacOSXInt.h"
#endif #endif
#endif /* __vtkTkInternals_h */ #endif /* vtkTkInternals_h */
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information. PURPOSE. See the above copyright notice for more information.
=========================================================================*/ =========================================================================*/
#ifndef __vtk_expat_h #ifndef vtk_expat_h
#define __vtk_expat_h #define vtk_expat_h
/* Use the expat library configured for VTK. */ /* Use the expat library configured for VTK. */
#cmakedefine VTK_USE_SYSTEM_EXPAT #cmakedefine VTK_USE_SYSTEM_EXPAT
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information. PURPOSE. See the above copyright notice for more information.
=========================================================================*/ =========================================================================*/
#ifndef __vtk_freetype_h #ifndef vtk_freetype_h
#define __vtk_freetype_h #define vtk_freetype_h
/* Use the freetype library configured for VTK. */ /* Use the freetype library configured for VTK. */
#cmakedefine VTK_USE_SYSTEM_FREETYPE #cmakedefine VTK_USE_SYSTEM_FREETYPE
...@@ -24,4 +24,4 @@ ...@@ -24,4 +24,4 @@
# include <vtkfreetype/include/ft2build.h> # include <vtkfreetype/include/ft2build.h>
#endif #endif
#endif // #ifndef __vtk_freetype_h #endif // #ifndef vtk_freetype_h
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information. PURPOSE. See the above copyright notice for more information.
=========================================================================*/ =========================================================================*/
#ifndef __vtk_gl2ps_h #ifndef vtk_gl2ps_h
#define __vtk_gl2ps_h #define vtk_gl2ps_h
/* Use the gl2ps library configured for VTK. */ /* Use the gl2ps library configured for VTK. */
#cmakedefine VTK_USE_SYSTEM_GL2PS #cmakedefine VTK_USE_SYSTEM_GL2PS
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information. PURPOSE. See the above copyright notice for more information.
=========================================================================*/ =========================================================================*/
#ifndef __vtk_glew_h #ifndef vtk_glew_h
#define __vtk_glew_h #define vtk_glew_h
#define GLEW_NO_GLU #define GLEW_NO_GLU
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information. PURPOSE. See the above copyright notice for more information.
=========================================================================*/ =========================================================================*/
#ifndef __vtk_hdf5_h #ifndef vtk_hdf5_h
#define __vtk_hdf5_h #define vtk_hdf5_h
/* Use the zlib library configured for VTK. */ /* Use the zlib library configured for VTK. */
#cmakedefine VTK_USE_SYSTEM_HDF5 #cmakedefine VTK_USE_SYSTEM_HDF5
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information. PURPOSE. See the above copyright notice for more information.
=========================================================================*/ =========================================================================*/
#ifndef __vtk_jpeg_h #ifndef vtk_jpeg_h
#define __vtk_jpeg_h #define vtk_jpeg_h
/* Use the jpeg library configured for VTK. */ /* Use the jpeg library configured for VTK. */
#cmakedefine VTK_USE_SYSTEM_JPEG #cmakedefine VTK_USE_SYSTEM_JPEG
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information. PURPOSE. See the above copyright notice for more information.
=========================================================================*/ =========================================================================*/
#ifndef __vtk_jsoncpp_h #ifndef vtk_jsoncpp_h
#define __vtk_jsoncpp_h #define vtk_jsoncpp_h
/* Use the JsonCpp library configured for VTK. */ /* Use the JsonCpp library configured for VTK. */
#cmakedefine VTK_USE_SYSTEM_JSONCPP #cmakedefine VTK_USE_SYSTEM_JSONCPP
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information. PURPOSE. See the above copyright notice for more information.
=========================================================================*/ =========================================================================*/
#ifndef __vtk_libproj4_h #ifndef vtk_libproj4_h
#define __vtk_libproj4_h #define vtk_libproj4_h
/* Use the libproj4 library configured for VTK. */ /* Use the libproj4 library configured for VTK. */
#cmakedefine VTK_USE_SYSTEM_LIBPROJ4