Update header guards to new style (__CLASS --> CLASS_h).

CMake/vtkCreateArrayDispatchArrayList.cmake

@@ -185,8 +185,8 @@ set(temp
   "// This file is autogenerated by vtkCreateArrayDispatchArrayList.cmake.\n"
   "// Do not edit this file. Your changes will not be saved.\n"
   "\n"
-  "#ifndef __vtkArrayDispatchArrayList\n"
-  "#define __vtkArrayDispatchArrayList\n"
+  "#ifndef vtkArrayDispatchArrayList_h\n"
+  "#define vtkArrayDispatchArrayList_h\n"
   "\n"
 )
 
@@ -218,7 +218,7 @@ list(APPEND temp
   "\n"
   "} // end namespace vtkArrayDispatch\n"
   "\n"
-  "#endif // __vtkArrayDispatchArrayList\n"
+  "#endif // vtkArrayDispatchArrayList_h\n"
 )
 
 CollapseString("${temp}" ${result})

CMake/vtkCreateTypeListMacros.cmake

@@ -87,8 +87,8 @@ function(CreateTypeListMacros HEADER MAX_SIZE MACRO_PREFIX TYPELIST_T
     "// This file is autogenerated by vtkCreateTypeListMacros.cmake.\n"
     "// Do not edit this file, your changes will not be saved.\n"
     "\n"
-    "#ifndef __vtkTypeListMacros\n"
-    "#define __vtkTypeListMacros\n"
+    "#ifndef vtkTypeListMacros_h\n"
+    "#define vtkTypeListMacros_h\n"
     "\n"
     "#include \"vtkTypeList.h\"\n"
     "\n"
@@ -113,7 +113,7 @@ function(CreateTypeListMacros HEADER MAX_SIZE MACRO_PREFIX TYPELIST_T
     list(APPEND result ${temp})
   endforeach()
 
-  list(APPEND result "\n#endif // __vtkTypeListMacros")
+  list(APPEND result "\n#endif // vtkTypeListMacros_h")
   CollapseString("${result}" result)
   set(${HEADER} "${result}" PARENT_SCOPE)
 endfunction()

Common/Core/Testing/Cxx/TestArrayDispatchers.cxx

@@ -17,7 +17,7 @@
 // to run regardless of the compiled dispatch configuration. Note that this is
 // only possible because we do not use dispatches that are compiled into other
 // translation units, but only explicit dispatches that we generate here.
-#define __vtkArrayDispatchArrayList // Skip loading the actual header
+#define vtkArrayDispatchArrayList_h // Skip loading the actual header
 
 #include "vtkAoSDataArrayTemplate.h"
 #include "vtkSoADataArrayTemplate.h"

Common/Core/vtkTypeList.h

@@ -45,8 +45,8 @@
 // .SECTION See Also
 // vtkArrayDispatch vtkTypeListMacros
 
-#ifndef __vtkTypeList_h
-#define __vtkTypeList_h
+#ifndef vtkTypeList_h
+#define vtkTypeList_h
 
 #include "vtkTypeListMacros.h"
 
@@ -148,5 +148,5 @@ struct Append;
 
 #include "vtkTypeList.txx"
 
-#endif //__vtkTypeList_h
+#endif // vtkTypeList_h
 // VTK-HeaderTest-Exclude: vtkTypeList.h

Common/Core/vtkTypeList.txx

@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __vtkTypeList_txx
-#define __vtkTypeList_txx
+#ifndef vtkTypeList_txx
+#define vtkTypeList_txx
 
 #include "vtkTypeList.h"
 
@@ -313,4 +313,4 @@ struct Append<vtkTypeList::TypeList<Head, Tail>, T>
 
 }
 
-#endif // __vtkTypeList_txx
+#endif // vtkTypeList_txx