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

@@ -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 <dax/internal/Configure.h>
 
 #include <dax/cont/DeviceAdapter.h>
-#endif // __vtkDaxConfig_h
+#endif // vtkDaxConfig_h

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 <vector>

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"

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 <vector>

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
 

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 <tbb/atomic.h>
 

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 <tbb/enumerable_thread_specific.h>
 

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.  */
 

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

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 <cmath>
 #include <float.h> // for _isnan, _finite on Win32
@@ -100,4 +100,4 @@
 # define VTK_NON_FINITE_CAUSES_EXCEPTIONS
 #endif
 
-#endif //__vtkMathConfigure_h
+#endif //vtkMathConfigure_h

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.  */
 

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"

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

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"

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

GUISupport/MFC/vtkMFCConfigure.h.in

@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkMFCConfigure_h
-#define __vtkMFCConfigure_h
+#ifndef vtkMFCConfigure_h
+#define vtkMFCConfigure_h
 
 #include "vtkConfigure.h"
 

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.  */
 

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 */
 

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

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

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

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"

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. */
 

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 */

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"

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. */

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 */
 

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

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 <vtkfreetype/include/ft2build.h>
 #endif
 
-#endif // #ifndef __vtk_freetype_h
+#endif // #ifndef vtk_freetype_h

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

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
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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.  */
 

Wrapping/Python/vtkPythonAppInitConfigure.h.in

-#ifndef __vtkPythonAppInitConfigure_h
-#define __vtkPythonAppInitConfigure_h
+#ifndef vtkPythonAppInitConfigure_h
+#define vtkPythonAppInitConfigure_h
 
 #define VTK_PYTHON_LIBRARY_DIR "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@"
 

Wrapping/Tcl/vtkTkAppInitConfigure.h.in

-#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