Removed a few of the remaining illegal names containing double underscores

CMake/pythonmodules.h.in

@@ -13,8 +13,8 @@
 
 =========================================================================*/
 // *********** FILE GENERATED BY CMAKE. DO NOT EDIT ****************
-#ifndef __@_nameUpper@_h
-#define __@_nameUpper@_h
+#ifndef @_nameUpper@_h
+#define @_nameUpper@_h
 
 #include <Python.h>
 

CMake/vtkMakeInstantiator.h.in

-#ifndef __@VTK_MAKE_INSTANTIATOR_CLASS_NAME@_h
-#define __@VTK_MAKE_INSTANTIATOR_CLASS_NAME@_h
+#ifndef @VTK_MAKE_INSTANTIATOR_CLASS_NAME@_h
+#define @VTK_MAKE_INSTANTIATOR_CLASS_NAME@_h
 
 #include "vtkInstantiator.h"
 

CMake/vtkObjectFactory.h.in

@@ -13,8 +13,8 @@
 
 =========================================================================*/
 
-#ifndef __@vtk-module@ObjectFactory_h
-#define __@vtk-module@ObjectFactory_h
+#ifndef @vtk-module@ObjectFactory_h
+#define @vtk-module@ObjectFactory_h
 
 #include "@vtk-module@Module.h" // For export macro
 #include "vtkObjectFactory.h"
@@ -39,4 +39,4 @@ private:
   void operator=(const @vtk-module@ObjectFactory&) = delete;
 };
 
-#endif // __@vtk-module@ObjectFactory_h
+#endif // @vtk-module@ObjectFactory_h

Common/Core/vtkOStrStreamWrapper.h

@@ -27,8 +27,8 @@
 #ifndef vtkOStrStreamWrapper_h
 #define vtkOStrStreamWrapper_h
 
-#ifndef __VTK_SYSTEM_INCLUDES__INSIDE
-Do_not_include_vtkOStrStreamWrapper_directly__vtkSystemIncludes_includes_it;
+#ifndef VTK_SYSTEM_INCLUDES_INSIDE
+Do_not_include_vtkOStrStreamWrapper_directly_vtkSystemIncludes_includes_it;
 #endif
 
 class VTKCOMMONCORE_EXPORT vtkOStrStreamWrapper: public vtkOStreamWrapper

Common/Core/vtkOStreamWrapper.h

@@ -29,8 +29,8 @@
 
 #include "vtkCommonCoreModule.h"
 
-#ifndef __VTK_SYSTEM_INCLUDES__INSIDE
-Do_not_include_vtkOStreamWrapper_directly__vtkSystemIncludes_includes_it;
+#ifndef VTK_SYSTEM_INCLUDES_INSIDE
+Do_not_include_vtkOStreamWrapper_directly_vtkSystemIncludes_includes_it;
 #endif
 
 class vtkIndent;

Common/Core/vtkSystemIncludes.h

@@ -25,9 +25,9 @@
 #define vtkSystemIncludes_h
 
 /* first include the local configuration for this machine */
-#define __VTK_SYSTEM_INCLUDES__INSIDE
+#define VTK_SYSTEM_INCLUDES_INSIDE
 #include "vtkWin32Header.h"
-#undef __VTK_SYSTEM_INCLUDES__INSIDE
+#undef VTK_SYSTEM_INCLUDES_INSIDE
 
 // The language wrapper files do not need the real streams.  They
 // define VTK_STREAMS_FWD_ONLY so that the streams are only
@@ -48,10 +48,10 @@
 // this should be removed at some point
 #define VTK_USE_EXECUTIVES
 
-#define __VTK_SYSTEM_INCLUDES__INSIDE
+#define VTK_SYSTEM_INCLUDES_INSIDE
 #include "vtkOStreamWrapper.h"    // Include the ostream wrapper.
 #include "vtkOStrStreamWrapper.h" // Include the ostrstream wrapper.
-#undef __VTK_SYSTEM_INCLUDES__INSIDE
+#undef VTK_SYSTEM_INCLUDES_INSIDE
 
 // Include generic stuff.
 #include <stdio.h>

Common/Core/vtkWin32Header.h

@@ -23,8 +23,8 @@
 #ifndef vtkWin32Header_h
 #define vtkWin32Header_h
 
-#ifndef __VTK_SYSTEM_INCLUDES__INSIDE
-Do_not_include_vtkWin32Header_directly__vtkSystemIncludes_includes_it;
+#ifndef VTK_SYSTEM_INCLUDES_INSIDE
+Do_not_include_vtkWin32Header_directly_vtkSystemIncludes_includes_it;
 #endif
 
 #include "vtkConfigure.h"

Utilities/EncodeString/vtkEncodeString.cxx

@@ -205,8 +205,8 @@ int main(int argc,
                 << " * Declare the " << argv[3] << " string." << endl
                 << " *" << endl
                 << " */" << endl
-                << "#ifndef __"<<fileName<<"_h"<<endl
-                << "#define __"<<fileName<<"_h"<<endl
+                << "#ifndef "<<fileName<<"_h"<<endl
+                << "#define "<<fileName<<"_h"<<endl
                 << endl;
      if (argc > 5)
       {
@@ -236,7 +236,7 @@ int main(int argc,
                     << endl;
         }
 
-      hs.Stream << "#endif /* #ifndef __" <<fileName<< "_h */" << endl;
+      hs.Stream << "#endif /* #ifndef " <<fileName<< "_h */" << endl;
 
       std::string headerOutput=GetFilenameWithoutExtension(output)+".h";