From 7cef24ea28d5422f4dcc012dda3645e81e6e47c8 Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Thu, 18 Dec 2014 16:19:52 -0500 Subject: [PATCH] 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 --- Accelerators/Dax/vtkDaxConfig.h.in | 6 +++--- Common/Core/SMP/Kaapi/vtkSMPThreadLocal.h.in | 4 ++-- Common/Core/SMP/Sequential/vtkAtomicInt.h.in | 4 ++-- Common/Core/SMP/Sequential/vtkSMPThreadLocal.h.in | 4 ++-- Common/Core/SMP/Simple/vtkSMPThreadLocal.h.in | 4 ++-- Common/Core/SMP/TBB/vtkAtomicInt.h.in | 4 ++-- Common/Core/SMP/TBB/vtkSMPThreadLocal.h.in | 4 ++-- Common/Core/vtkConfigure.h.in | 4 ++-- Common/Core/vtkFloatingPointExceptionsConfigure.h.in | 6 +++--- Common/Core/vtkMathConfigure.h.in | 6 +++--- Common/Core/vtkToolkits.h.in | 4 ++-- Common/Core/vtkTypedArray.h.in | 4 ++-- Common/Core/vtkVersionMacros.h.in | 4 ++-- Domains/Chemistry/vtkChemistryConfigure.h.in | 4 ++-- .../StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in | 4 ++-- GUISupport/MFC/vtkMFCConfigure.h.in | 4 ++-- IO/FFMPEG/vtkFFMPEGConfig.h.in | 4 ++-- IO/Movie/vtkIOMovieConfigure.h.in | 4 ++-- IO/MySQL/Testing/Cxx/vtkIOMySQLTestingCxxConfigure.h.in | 4 ++-- IO/ODBC/Testing/Cxx/vtkIOODBCTestingCxxConfigure.h.in | 4 ++-- .../Testing/Cxx/vtkIOPostgresSQLTestingCxxConfigure.h.in | 4 ++-- Rendering/OpenGL/vtkOpenGLError.h.in | 4 ++-- Rendering/OpenGL/vtkRenderingOpenGLConfigure.h.in | 4 ++-- Rendering/OpenGL/vtkTDxConfigure.h.in | 6 +++--- Rendering/OpenGL2/vtkOpenGLError.h.in | 4 ++-- Rendering/OpenGL2/vtkRenderingOpenGLConfigure.h.in | 4 ++-- Rendering/Tk/vtkTkInternals.h.in | 6 +++--- ThirdParty/expat/vtk_expat.h.in | 4 ++-- ThirdParty/freetype/vtk_freetype.h.in | 6 +++--- ThirdParty/gl2ps/vtk_gl2ps.h.in | 4 ++-- ThirdParty/glew/vtk_glew.h.in | 4 ++-- ThirdParty/hdf5/vtk_hdf5.h.in | 4 ++-- ThirdParty/jpeg/vtk_jpeg.h.in | 4 ++-- ThirdParty/jsoncpp/vtk_jsoncpp.h.in | 4 ++-- ThirdParty/libproj4/vtk_libproj4.h.in | 4 ++-- ThirdParty/libxml2/vtk_libxml2.h.in | 4 ++-- ThirdParty/netcdf/vtk_netcdf.h.in | 4 ++-- ThirdParty/netcdf/vtk_netcdfcpp.h.in | 4 ++-- ThirdParty/oggtheora/vtk_oggtheora.h.in | 4 ++-- ThirdParty/png/vtk_png.h.in | 4 ++-- ThirdParty/tiff/vtk_tiff.h.in | 4 ++-- ThirdParty/xdmf2/vtk_xdmf2.h.in | 4 ++-- ThirdParty/xdmf3/vtk_xdmf3.h.in | 4 ++-- ThirdParty/zlib/vtk_zlib.h.in | 4 ++-- Utilities/Python/vtkPythonConfigure.h.in | 4 ++-- Wrapping/Python/vtkPythonAppInitConfigure.h.in | 4 ++-- Wrapping/Tcl/vtkTkAppInitConfigure.h.in | 4 ++-- 47 files changed, 100 insertions(+), 100 deletions(-) diff --git a/Accelerators/Dax/vtkDaxConfig.h.in b/Accelerators/Dax/vtkDaxConfig.h.in index 6327ad368e..c177fa1c1e 100644 --- a/Accelerators/Dax/vtkDaxConfig.h.in +++ b/Accelerators/Dax/vtkDaxConfig.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtkDaxConfig_h -#define __vtkDaxConfig_h +#ifndef vtkDaxConfig_h +#define vtkDaxConfig_h // 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 @@ -38,4 +38,4 @@ #include #include -#endif // __vtkDaxConfig_h +#endif // vtkDaxConfig_h diff --git a/Common/Core/SMP/Kaapi/vtkSMPThreadLocal.h.in b/Common/Core/SMP/Kaapi/vtkSMPThreadLocal.h.in index 58b47a2034..795351195b 100644 --- a/Common/Core/SMP/Kaapi/vtkSMPThreadLocal.h.in +++ b/Common/Core/SMP/Kaapi/vtkSMPThreadLocal.h.in @@ -70,8 +70,8 @@ // iterate over them together, use a struct or class to group them together // and use a thread local of that class. -#ifndef __vtkSMPThreadLocal_h -#define __vtkSMPThreadLocal_h +#ifndef vtkSMPThreadLocal_h +#define vtkSMPThreadLocal_h #include "vtkSystemIncludes.h" #include diff --git a/Common/Core/SMP/Sequential/vtkAtomicInt.h.in b/Common/Core/SMP/Sequential/vtkAtomicInt.h.in index 362cdd536f..784eec1b4d 100644 --- a/Common/Core/SMP/Sequential/vtkAtomicInt.h.in +++ b/Common/Core/SMP/Sequential/vtkAtomicInt.h.in @@ -31,8 +31,8 @@ // platform or compiler, mutexes, which are significantly slower, are used // as a fallback. -#ifndef __vtkAtomicInt_h -#define __vtkAtomicInt_h +#ifndef vtkAtomicInt_h +#define vtkAtomicInt_h #include "vtkCommonCoreModule.h" // For export macro #include "vtkSystemIncludes.h" diff --git a/Common/Core/SMP/Sequential/vtkSMPThreadLocal.h.in b/Common/Core/SMP/Sequential/vtkSMPThreadLocal.h.in index 7ca14262a9..27b24a045a 100644 --- a/Common/Core/SMP/Sequential/vtkSMPThreadLocal.h.in +++ b/Common/Core/SMP/Sequential/vtkSMPThreadLocal.h.in @@ -33,8 +33,8 @@ // Note that this particular implementation is designed to work in sequential // mode and supports only 1 thread. -#ifndef __vtkSMPThreadLocal_h -#define __vtkSMPThreadLocal_h +#ifndef vtkSMPThreadLocal_h +#define vtkSMPThreadLocal_h #include "vtkSystemIncludes.h" #include diff --git a/Common/Core/SMP/Simple/vtkSMPThreadLocal.h.in b/Common/Core/SMP/Simple/vtkSMPThreadLocal.h.in index 54e61117fc..7a8a1c74c2 100644 --- a/Common/Core/SMP/Simple/vtkSMPThreadLocal.h.in +++ b/Common/Core/SMP/Simple/vtkSMPThreadLocal.h.in @@ -73,8 +73,8 @@ // iterate over them together, use a struct or class to group them together // and use a thread local of that class. -#ifndef __vtkSMPThreadLocal_h -#define __vtkSMPThreadLocal_h +#ifndef vtkSMPThreadLocal_h +#define vtkSMPThreadLocal_h #include "vtkCommonCoreModule.h" // For export macro diff --git a/Common/Core/SMP/TBB/vtkAtomicInt.h.in b/Common/Core/SMP/TBB/vtkAtomicInt.h.in index d60865e55b..15706c4ab6 100644 --- a/Common/Core/SMP/TBB/vtkAtomicInt.h.in +++ b/Common/Core/SMP/TBB/vtkAtomicInt.h.in @@ -15,8 +15,8 @@ // .NAME vtkAtomicInt - // .SECTION Description -#ifndef __vtkAtomicInt_h -#define __vtkAtomicInt_h +#ifndef vtkAtomicInt_h +#define vtkAtomicInt_h #include diff --git a/Common/Core/SMP/TBB/vtkSMPThreadLocal.h.in b/Common/Core/SMP/TBB/vtkSMPThreadLocal.h.in index 55805b8ae7..0000b7671f 100644 --- a/Common/Core/SMP/TBB/vtkSMPThreadLocal.h.in +++ b/Common/Core/SMP/TBB/vtkSMPThreadLocal.h.in @@ -70,8 +70,8 @@ // iterate over them together, use a struct or class to group them together // and use a thread local of that class. -#ifndef __vtkSMPThreadLocal_h -#define __vtkSMPThreadLocal_h +#ifndef vtkSMPThreadLocal_h +#define vtkSMPThreadLocal_h #include diff --git a/Common/Core/vtkConfigure.h.in b/Common/Core/vtkConfigure.h.in index d3e1799f55..215ef46396 100644 --- a/Common/Core/vtkConfigure.h.in +++ b/Common/Core/vtkConfigure.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtkConfigure_h -#define __vtkConfigure_h +#ifndef vtkConfigure_h +#define vtkConfigure_h /* This header is configured by VTK's build process. */ diff --git a/Common/Core/vtkFloatingPointExceptionsConfigure.h.in b/Common/Core/vtkFloatingPointExceptionsConfigure.h.in index ebb9dfeaa6..519715d5bd 100644 --- a/Common/Core/vtkFloatingPointExceptionsConfigure.h.in +++ b/Common/Core/vtkFloatingPointExceptionsConfigure.h.in @@ -14,8 +14,8 @@ =========================================================================*/ -#ifndef __vtkFloatingPointExceptionsConfigure_h -#define __vtkFloatingPointExceptionsConfigure_h +#ifndef vtkFloatingPointExceptionsConfigure_h +#define vtkFloatingPointExceptionsConfigure_h #cmakedefine VTK_HAS_FEENABLEEXCEPT @@ -24,4 +24,4 @@ # define VTK_USE_FENV 1 #endif -#endif //__vtkFloatingPointExceptionsConfigure_h +#endif //vtkFloatingPointExceptionsConfigure_h diff --git a/Common/Core/vtkMathConfigure.h.in b/Common/Core/vtkMathConfigure.h.in index 7a9432e147..bd8a650b2c 100644 --- a/Common/Core/vtkMathConfigure.h.in +++ b/Common/Core/vtkMathConfigure.h.in @@ -18,8 +18,8 @@ See Copyright.txt or http://www.paraview.org/HTML/Copyright.html for details. ----------------------------------------------------------------------------*/ -#ifndef __vtkMathConfigure_h -#define __vtkMathConfigure_h +#ifndef vtkMathConfigure_h +#define vtkMathConfigure_h #include #include // for _isnan, _finite on Win32 @@ -100,4 +100,4 @@ # define VTK_NON_FINITE_CAUSES_EXCEPTIONS #endif -#endif //__vtkMathConfigure_h +#endif //vtkMathConfigure_h diff --git a/Common/Core/vtkToolkits.h.in b/Common/Core/vtkToolkits.h.in index adfe634314..002038d94c 100644 --- a/Common/Core/vtkToolkits.h.in +++ b/Common/Core/vtkToolkits.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtkToolkits_h -#define __vtkToolkits_h +#ifndef vtkToolkits_h +#define vtkToolkits_h /* This header is configured by VTK's build process. */ diff --git a/Common/Core/vtkTypedArray.h.in b/Common/Core/vtkTypedArray.h.in index ca98cdb4c7..c8a4a8cd75 100644 --- a/Common/Core/vtkTypedArray.h.in +++ b/Common/Core/vtkTypedArray.h.in @@ -18,8 +18,8 @@ // provides methods for insertion and retrieval of values and will // automatically resize itself to hold new data. -#ifndef __vtkType@VTK_TYPE_NAME@Array_h -#define __vtkType@VTK_TYPE_NAME@Array_h +#ifndef vtkType@VTK_TYPE_NAME@Array_h +#define vtkType@VTK_TYPE_NAME@Array_h #include "vtkCommonCoreModule.h" // For export macro #include "vtk@VTK_TYPE_NATIVE@Array.h" diff --git a/Common/Core/vtkVersionMacros.h.in b/Common/Core/vtkVersionMacros.h.in index dc14890dbd..e5b467b639 100644 --- a/Common/Core/vtkVersionMacros.h.in +++ b/Common/Core/vtkVersionMacros.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtkVersionMacros_h -#define __vtkVersionMacros_h +#ifndef vtkVersionMacros_h +#define vtkVersionMacros_h /* In development versions the minor component is odd and the build component encodes a date in CCYYMMDD format. In release versions diff --git a/Domains/Chemistry/vtkChemistryConfigure.h.in b/Domains/Chemistry/vtkChemistryConfigure.h.in index 45981b567a..fe8697e9b9 100644 --- a/Domains/Chemistry/vtkChemistryConfigure.h.in +++ b/Domains/Chemistry/vtkChemistryConfigure.h.in @@ -13,8 +13,8 @@ =========================================================================*/ -#ifndef __vtkDomainsChemistryConfigure_h -#define __vtkDomainsChemistryConfigure_h +#ifndef vtkDomainsChemistryConfigure_h +#define vtkDomainsChemistryConfigure_h /* Where the Blue Obelisk Data Repository files are installed */ #define VTK_BODR_DATA_PATH "@CMAKE_INSTALL_PREFIX@/@VTK_INSTALL_DATA_DIR@/vtkDomainsChemistry" diff --git a/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in b/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in index b0afd32965..19323e9f4e 100644 --- a/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in +++ b/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in @@ -13,8 +13,8 @@ =========================================================================*/ -#ifndef __vtkFiltersStatisticsGnuRConfigure_h -#define __vtkFiltersStatisticsGnuRConfigure_h +#ifndef vtkFiltersStatisticsGnuRConfigure_h +#define vtkFiltersStatisticsGnuRConfigure_h /* Set the whether we have UINTPTR_T defined in support of the GNU R interface */ #cmakedefine HAVE_VTK_UINTPTR_T diff --git a/GUISupport/MFC/vtkMFCConfigure.h.in b/GUISupport/MFC/vtkMFCConfigure.h.in index 098d1289e4..8116e30ad1 100644 --- a/GUISupport/MFC/vtkMFCConfigure.h.in +++ b/GUISupport/MFC/vtkMFCConfigure.h.in @@ -13,8 +13,8 @@ =========================================================================*/ -#ifndef __vtkMFCConfigure_h -#define __vtkMFCConfigure_h +#ifndef vtkMFCConfigure_h +#define vtkMFCConfigure_h #include "vtkConfigure.h" diff --git a/IO/FFMPEG/vtkFFMPEGConfig.h.in b/IO/FFMPEG/vtkFFMPEGConfig.h.in index 825098410d..d0b8cf48a7 100644 --- a/IO/FFMPEG/vtkFFMPEGConfig.h.in +++ b/IO/FFMPEG/vtkFFMPEGConfig.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtkFFMPEGConfig_h -#define __vtkFFMPEGConfig_h +#ifndef vtkFFMPEGConfig_h +#define vtkFFMPEGConfig_h /* This header is configured by VTK's build process. */ diff --git a/IO/Movie/vtkIOMovieConfigure.h.in b/IO/Movie/vtkIOMovieConfigure.h.in index 9052d1e7ee..bee58e24ac 100644 --- a/IO/Movie/vtkIOMovieConfigure.h.in +++ b/IO/Movie/vtkIOMovieConfigure.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtkIOMovieConfigure_h -#define __vtkIOMovieConfigure_h +#ifndef vtkIOMovieConfigure_h +#define vtkIOMovieConfigure_h /* This header contains build settings for the vtkIOMovie module */ diff --git a/IO/MySQL/Testing/Cxx/vtkIOMySQLTestingCxxConfigure.h.in b/IO/MySQL/Testing/Cxx/vtkIOMySQLTestingCxxConfigure.h.in index 1ef1891d06..c527086a26 100644 --- a/IO/MySQL/Testing/Cxx/vtkIOMySQLTestingCxxConfigure.h.in +++ b/IO/MySQL/Testing/Cxx/vtkIOMySQLTestingCxxConfigure.h.in @@ -13,8 +13,8 @@ =========================================================================*/ -#ifndef __vtkIOMySQLTestingCxxConfigure_h -#define __vtkIOMySQLTestingCxxConfigure_h +#ifndef vtkIOMySQLTestingCxxConfigure_h +#define vtkIOMySQLTestingCxxConfigure_h #cmakedefine VTK_MYSQL_TEST_URL #ifdef VTK_MYSQL_TEST_URL diff --git a/IO/ODBC/Testing/Cxx/vtkIOODBCTestingCxxConfigure.h.in b/IO/ODBC/Testing/Cxx/vtkIOODBCTestingCxxConfigure.h.in index 393d905b7e..fcfda06912 100644 --- a/IO/ODBC/Testing/Cxx/vtkIOODBCTestingCxxConfigure.h.in +++ b/IO/ODBC/Testing/Cxx/vtkIOODBCTestingCxxConfigure.h.in @@ -13,8 +13,8 @@ =========================================================================*/ -#ifndef __vtkIOODBCTestingCxxConfigure_h -#define __vtkIOODBCTestingCxxConfigure_h +#ifndef vtkIOODBCTestingCxxConfigure_h +#define vtkIOODBCTestingCxxConfigure_h #cmakedefine VTK_ODBC_TEST_DSN #ifdef VTK_ODBC_TEST_DSN diff --git a/IO/PostgreSQL/Testing/Cxx/vtkIOPostgresSQLTestingCxxConfigure.h.in b/IO/PostgreSQL/Testing/Cxx/vtkIOPostgresSQLTestingCxxConfigure.h.in index 9edcb87881..791a25ac3f 100644 --- a/IO/PostgreSQL/Testing/Cxx/vtkIOPostgresSQLTestingCxxConfigure.h.in +++ b/IO/PostgreSQL/Testing/Cxx/vtkIOPostgresSQLTestingCxxConfigure.h.in @@ -13,8 +13,8 @@ =========================================================================*/ -#ifndef __vtkIOPostgresSQLTestingCxxConfigure_h -#define __vtkIOPostgresSQLTestingCxxConfigure_h +#ifndef vtkIOPostgresSQLTestingCxxConfigure_h +#define vtkIOPostgresSQLTestingCxxConfigure_h #cmakedefine VTK_PSQL_TEST_URL #ifdef VTK_PSQL_TEST_URL diff --git a/Rendering/OpenGL/vtkOpenGLError.h.in b/Rendering/OpenGL/vtkOpenGLError.h.in index 0b28de4524..bd0d520dd9 100644 --- a/Rendering/OpenGL/vtkOpenGLError.h.in +++ b/Rendering/OpenGL/vtkOpenGLError.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtkOpenGLError_h -#define __vtkOpenGLError_h +#ifndef vtkOpenGLError_h +#define vtkOpenGLError_h #include "vtkgl.h" #include "vtkSetGet.h" diff --git a/Rendering/OpenGL/vtkRenderingOpenGLConfigure.h.in b/Rendering/OpenGL/vtkRenderingOpenGLConfigure.h.in index 329f8d9feb..25fdcdca10 100644 --- a/Rendering/OpenGL/vtkRenderingOpenGLConfigure.h.in +++ b/Rendering/OpenGL/vtkRenderingOpenGLConfigure.h.in @@ -13,8 +13,8 @@ =========================================================================*/ -#ifndef __vtkRenderingOpenGLConfigure_h -#define __vtkRenderingOpenGLConfigure_h +#ifndef vtkRenderingOpenGLConfigure_h +#define vtkRenderingOpenGLConfigure_h /* This header contains build settings for the vtkRenderingOpenGL module. */ diff --git a/Rendering/OpenGL/vtkTDxConfigure.h.in b/Rendering/OpenGL/vtkTDxConfigure.h.in index 6334f3af54..df18f41476 100644 --- a/Rendering/OpenGL/vtkTDxConfigure.h.in +++ b/Rendering/OpenGL/vtkTDxConfigure.h.in @@ -13,10 +13,10 @@ =========================================================================*/ -#ifndef __vtkTDxConfigure_h -#define __vtkTDxConfigure_h +#ifndef vtkTDxConfigure_h +#define vtkTDxConfigure_h /* Whether the 3Dconnexion devices are being used */ #cmakedefine VTK_USE_TDX -#endif /* __vtkTDxConfigure_h */ +#endif /* vtkTDxConfigure_h */ diff --git a/Rendering/OpenGL2/vtkOpenGLError.h.in b/Rendering/OpenGL2/vtkOpenGLError.h.in index 9bc5e86464..7ce4c030f5 100644 --- a/Rendering/OpenGL2/vtkOpenGLError.h.in +++ b/Rendering/OpenGL2/vtkOpenGLError.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtkOpenGLError_h -#define __vtkOpenGLError_h +#ifndef vtkOpenGLError_h +#define vtkOpenGLError_h #include "vtkSetGet.h" #include "vtk_glew.h" diff --git a/Rendering/OpenGL2/vtkRenderingOpenGLConfigure.h.in b/Rendering/OpenGL2/vtkRenderingOpenGLConfigure.h.in index 3d6605031d..ac4e988cc8 100644 --- a/Rendering/OpenGL2/vtkRenderingOpenGLConfigure.h.in +++ b/Rendering/OpenGL2/vtkRenderingOpenGLConfigure.h.in @@ -13,8 +13,8 @@ =========================================================================*/ -#ifndef __vtkRenderingOpenGLConfigure_h -#define __vtkRenderingOpenGLConfigure_h +#ifndef vtkRenderingOpenGLConfigure_h +#define vtkRenderingOpenGLConfigure_h /* This header contains build settings for the vtkRenderingOpenGL2 module. */ /* It provides some compatibility with the vtkRenderingOpenGL module. */ diff --git a/Rendering/Tk/vtkTkInternals.h.in b/Rendering/Tk/vtkTkInternals.h.in index 981ecbabb7..9d8d45032e 100644 --- a/Rendering/Tk/vtkTkInternals.h.in +++ b/Rendering/Tk/vtkTkInternals.h.in @@ -13,8 +13,8 @@ =========================================================================*/ -#ifndef __vtkTkInternals_h -#define __vtkTkInternals_h +#ifndef vtkTkInternals_h +#define vtkTkInternals_h #include "vtkRenderingOpenGLConfigure.h" // for COCOA, CARBON, X11, WIN32 @@ -48,5 +48,5 @@ extern "C" #include "tkMacOSXInt.h" #endif -#endif /* __vtkTkInternals_h */ +#endif /* vtkTkInternals_h */ diff --git a/ThirdParty/expat/vtk_expat.h.in b/ThirdParty/expat/vtk_expat.h.in index e62aa6ad4a..f7e163a87a 100644 --- a/ThirdParty/expat/vtk_expat.h.in +++ b/ThirdParty/expat/vtk_expat.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtk_expat_h -#define __vtk_expat_h +#ifndef vtk_expat_h +#define vtk_expat_h /* Use the expat library configured for VTK. */ #cmakedefine VTK_USE_SYSTEM_EXPAT diff --git a/ThirdParty/freetype/vtk_freetype.h.in b/ThirdParty/freetype/vtk_freetype.h.in index 3174b51b03..c3f6f4f394 100644 --- a/ThirdParty/freetype/vtk_freetype.h.in +++ b/ThirdParty/freetype/vtk_freetype.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtk_freetype_h -#define __vtk_freetype_h +#ifndef vtk_freetype_h +#define vtk_freetype_h /* Use the freetype library configured for VTK. */ #cmakedefine VTK_USE_SYSTEM_FREETYPE @@ -24,4 +24,4 @@ # include #endif -#endif // #ifndef __vtk_freetype_h +#endif // #ifndef vtk_freetype_h diff --git a/ThirdParty/gl2ps/vtk_gl2ps.h.in b/ThirdParty/gl2ps/vtk_gl2ps.h.in index 723b08acaf..525dfd04ef 100644 --- a/ThirdParty/gl2ps/vtk_gl2ps.h.in +++ b/ThirdParty/gl2ps/vtk_gl2ps.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtk_gl2ps_h -#define __vtk_gl2ps_h +#ifndef vtk_gl2ps_h +#define vtk_gl2ps_h /* Use the gl2ps library configured for VTK. */ #cmakedefine VTK_USE_SYSTEM_GL2PS diff --git a/ThirdParty/glew/vtk_glew.h.in b/ThirdParty/glew/vtk_glew.h.in index a9773ff478..3f95ba3963 100644 --- a/ThirdParty/glew/vtk_glew.h.in +++ b/ThirdParty/glew/vtk_glew.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtk_glew_h -#define __vtk_glew_h +#ifndef vtk_glew_h +#define vtk_glew_h #define GLEW_NO_GLU diff --git a/ThirdParty/hdf5/vtk_hdf5.h.in b/ThirdParty/hdf5/vtk_hdf5.h.in index f9dbddd6b8..ddce386c9e 100644 --- a/ThirdParty/hdf5/vtk_hdf5.h.in +++ b/ThirdParty/hdf5/vtk_hdf5.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtk_hdf5_h -#define __vtk_hdf5_h +#ifndef vtk_hdf5_h +#define vtk_hdf5_h /* Use the zlib library configured for VTK. */ #cmakedefine VTK_USE_SYSTEM_HDF5 diff --git a/ThirdParty/jpeg/vtk_jpeg.h.in b/ThirdParty/jpeg/vtk_jpeg.h.in index c59bb4dbe1..db840df164 100644 --- a/ThirdParty/jpeg/vtk_jpeg.h.in +++ b/ThirdParty/jpeg/vtk_jpeg.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtk_jpeg_h -#define __vtk_jpeg_h +#ifndef vtk_jpeg_h +#define vtk_jpeg_h /* Use the jpeg library configured for VTK. */ #cmakedefine VTK_USE_SYSTEM_JPEG diff --git a/ThirdParty/jsoncpp/vtk_jsoncpp.h.in b/ThirdParty/jsoncpp/vtk_jsoncpp.h.in index 6a84dc1b77..ac6fd52f6b 100644 --- a/ThirdParty/jsoncpp/vtk_jsoncpp.h.in +++ b/ThirdParty/jsoncpp/vtk_jsoncpp.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtk_jsoncpp_h -#define __vtk_jsoncpp_h +#ifndef vtk_jsoncpp_h +#define vtk_jsoncpp_h /* Use the JsonCpp library configured for VTK. */ #cmakedefine VTK_USE_SYSTEM_JSONCPP diff --git a/ThirdParty/libproj4/vtk_libproj4.h.in b/ThirdParty/libproj4/vtk_libproj4.h.in index 62af2a8c41..bd67484886 100644 --- a/ThirdParty/libproj4/vtk_libproj4.h.in +++ b/ThirdParty/libproj4/vtk_libproj4.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtk_libproj4_h -#define __vtk_libproj4_h +#ifndef vtk_libproj4_h +#define vtk_libproj4_h /* Use the libproj4 library configured for VTK. */ #cmakedefine VTK_USE_SYSTEM_LIBPROJ4 diff --git a/ThirdParty/libxml2/vtk_libxml2.h.in b/ThirdParty/libxml2/vtk_libxml2.h.in index 5111bc2948..b8150a23e9 100644 --- a/ThirdParty/libxml2/vtk_libxml2.h.in +++ b/ThirdParty/libxml2/vtk_libxml2.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtk_libxml2_h -#define __vtk_libxml2_h +#ifndef vtk_libxml2_h +#define vtk_libxml2_h /* Use the libxml2 library configured for VTK. */ #cmakedefine VTK_USE_SYSTEM_LIBXML2 diff --git a/ThirdParty/netcdf/vtk_netcdf.h.in b/ThirdParty/netcdf/vtk_netcdf.h.in index 9046b03a5b..f5a8281a66 100644 --- a/ThirdParty/netcdf/vtk_netcdf.h.in +++ b/ThirdParty/netcdf/vtk_netcdf.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtk_netcdf_h -#define __vtk_netcdf_h +#ifndef vtk_netcdf_h +#define vtk_netcdf_h /* Use the netcdf library configured for VTK. */ #cmakedefine VTK_USE_SYSTEM_NETCDF diff --git a/ThirdParty/netcdf/vtk_netcdfcpp.h.in b/ThirdParty/netcdf/vtk_netcdfcpp.h.in index 2f8ae97360..f7fb84090d 100644 --- a/ThirdParty/netcdf/vtk_netcdfcpp.h.in +++ b/ThirdParty/netcdf/vtk_netcdfcpp.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtk_netcdfcpp_h -#define __vtk_netcdfcpp_h +#ifndef vtk_netcdfcpp_h +#define vtk_netcdfcpp_h /* Use the netcdfcpp library configured for VTK. */ #cmakedefine VTK_USE_SYSTEM_NETCDF diff --git a/ThirdParty/oggtheora/vtk_oggtheora.h.in b/ThirdParty/oggtheora/vtk_oggtheora.h.in index bc40579c5d..03e9023273 100644 --- a/ThirdParty/oggtheora/vtk_oggtheora.h.in +++ b/ThirdParty/oggtheora/vtk_oggtheora.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtk_oggtheora_h -#define __vtk_oggtheora_h +#ifndef vtk_oggtheora_h +#define vtk_oggtheora_h /* Use the ogg/theora library configured for VTK. */ #cmakedefine VTK_USE_SYSTEM_OGGTHEORA diff --git a/ThirdParty/png/vtk_png.h.in b/ThirdParty/png/vtk_png.h.in index a51914f030..552582b275 100644 --- a/ThirdParty/png/vtk_png.h.in +++ b/ThirdParty/png/vtk_png.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtk_png_h -#define __vtk_png_h +#ifndef vtk_png_h +#define vtk_png_h /* Use the png library configured for VTK. */ #cmakedefine VTK_USE_SYSTEM_PNG diff --git a/ThirdParty/tiff/vtk_tiff.h.in b/ThirdParty/tiff/vtk_tiff.h.in index 23b6164248..e101466b7b 100644 --- a/ThirdParty/tiff/vtk_tiff.h.in +++ b/ThirdParty/tiff/vtk_tiff.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtk_tiff_h -#define __vtk_tiff_h +#ifndef vtk_tiff_h +#define vtk_tiff_h /* Use the tiff library configured for VTK. */ #cmakedefine VTK_USE_SYSTEM_TIFF diff --git a/ThirdParty/xdmf2/vtk_xdmf2.h.in b/ThirdParty/xdmf2/vtk_xdmf2.h.in index 137d89b9c4..fa5e5b037e 100644 --- a/ThirdParty/xdmf2/vtk_xdmf2.h.in +++ b/ThirdParty/xdmf2/vtk_xdmf2.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtk_xdmf2_h -#define __vtk_xdmf2_h +#ifndef vtk_xdmf2_h +#define vtk_xdmf2_h #endif diff --git a/ThirdParty/xdmf3/vtk_xdmf3.h.in b/ThirdParty/xdmf3/vtk_xdmf3.h.in index d73f490315..d6e851a887 100644 --- a/ThirdParty/xdmf3/vtk_xdmf3.h.in +++ b/ThirdParty/xdmf3/vtk_xdmf3.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtk_xdmf3_h -#define __vtk_xdmf3_h +#ifndef vtk_xdmf3_h +#define vtk_xdmf3_h /* Use the xdmf library configured for VTK. */ #cmakedefine VTK_USE_SYSTEM_XDMF3 diff --git a/ThirdParty/zlib/vtk_zlib.h.in b/ThirdParty/zlib/vtk_zlib.h.in index 9e987df402..c880874e46 100644 --- a/ThirdParty/zlib/vtk_zlib.h.in +++ b/ThirdParty/zlib/vtk_zlib.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtk_zlib_h -#define __vtk_zlib_h +#ifndef vtk_zlib_h +#define vtk_zlib_h /* Use the zlib library configured for VTK. */ #cmakedefine VTK_USE_SYSTEM_ZLIB diff --git a/Utilities/Python/vtkPythonConfigure.h.in b/Utilities/Python/vtkPythonConfigure.h.in index f4ef3bfd0d..1d2dcdf45f 100644 --- a/Utilities/Python/vtkPythonConfigure.h.in +++ b/Utilities/Python/vtkPythonConfigure.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef __vtkPythonConfigure_h -#define __vtkPythonConfigure_h +#ifndef vtkPythonConfigure_h +#define vtkPythonConfigure_h /* This header is configured by VTK's build process. */ diff --git a/Wrapping/Python/vtkPythonAppInitConfigure.h.in b/Wrapping/Python/vtkPythonAppInitConfigure.h.in index 735bfe1c44..8c5c660d63 100644 --- a/Wrapping/Python/vtkPythonAppInitConfigure.h.in +++ b/Wrapping/Python/vtkPythonAppInitConfigure.h.in @@ -1,5 +1,5 @@ -#ifndef __vtkPythonAppInitConfigure_h -#define __vtkPythonAppInitConfigure_h +#ifndef vtkPythonAppInitConfigure_h +#define vtkPythonAppInitConfigure_h #define VTK_PYTHON_LIBRARY_DIR "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@" diff --git a/Wrapping/Tcl/vtkTkAppInitConfigure.h.in b/Wrapping/Tcl/vtkTkAppInitConfigure.h.in index d6fce323b0..3e0dec7da2 100644 --- a/Wrapping/Tcl/vtkTkAppInitConfigure.h.in +++ b/Wrapping/Tcl/vtkTkAppInitConfigure.h.in @@ -1,5 +1,5 @@ -#ifndef __vtkTkAppInitConfigure_h -#define __vtkTkAppInitConfigure_h +#ifndef vtkTkAppInitConfigure_h +#define vtkTkAppInitConfigure_h /* Whether we are linking to Tcl/Tk statically. */ #cmakedefine VTK_TCL_TK_STATIC -- GitLab