Make sure all header wrapper macros start with vtk_m_ rather than vtkm_

We made this change a while ago to help with completion in IDEs.
(Completion was matching a bunch of wrapper macros that were almost
never used anywhere.) Most of the changes are in comments, but there are
a few bad macro definitions.

vtkm/TypeTraits.h

@@ -144,4 +144,4 @@ template<typename T, int Size> struct TypeTraits<vtkm::Tuple<T, Size> >
 
 } // namespace vtkm
 
-#endif //vtkm_TypeTraits_h
+#endif //vtk_m_TypeTraits_h

vtkm/Types.h

@@ -926,4 +926,4 @@ VTKM_EXEC_CONT_EXPORT vtkm::Tuple<Tb,Size> operator*(const Ta &a,
   return result;
 }
 
-#endif //vtkm_Types_h
+#endif //vtk_m_Types_h

vtkm/VectorTraits.h

@@ -221,4 +221,4 @@ VTKM_BASIC_TYPE_VECTOR(unsigned long long);
 
 }
 
-#endif //vtkm_VectorTraits_h
+#endif //vtk_m_VectorTraits_h

vtkm/cont/ArrayContainerControl.h

@@ -187,4 +187,4 @@ public:
 
 #endif
 
-#endif //vtkm_cont__ArrayContainerControl_h
+#endif //vtk_m_cont__ArrayContainerControl_h

vtkm/cont/ArrayContainerControlBasic.h

@@ -181,4 +181,4 @@ private:
 }
 } // namespace vtkm::cont
 
-#endif //vtkm_cont__ArrayContainerControlBasic_h
+#endif //vtk_m_cont__ArrayContainerControlBasic_h

vtkm/cont/ArrayContainerControlImplicit.h

@@ -222,4 +222,4 @@ private:
 }
 } // namespace vtkm::cont
 
-#endif //vtkm_cont_ArrayContainerControlImplicit
+#endif //vtk_m_cont_ArrayContainerControlImplicit

vtkm/cont/ArrayHandle.h

@@ -556,4 +556,4 @@ make_ArrayHandle(const std::vector<T,Allocator> &array)
 }
 }
 
-#endif //vtkm_cont_ArrayHandle_h
+#endif //vtk_m_cont_ArrayHandle_h

vtkm/cont/ArrayHandleCounting.h

@@ -17,8 +17,8 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
-#ifndef vtkm_cont_ArrayHandleCounting_h
+#ifndef vtk_m_cont_ArrayHandleCounting_h
-#define vtkm_cont_ArrayHandleCounting_h
+#define vtk_m_cont_ArrayHandleCounting_h
 
 #include <vtkm/cont/ArrayContainerControlImplicit.h>
 #include <vtkm/cont/ArrayHandle.h>
@@ -143,4 +143,4 @@ make_ArrayHandleCounting(CountingValueType startingValue,
 }
 } // namespace vtkm::cont
 
-#endif //vtkm_cont_ArrayHandleCounting_h
+#endif //vtk_m_cont_ArrayHandleCounting_h

vtkm/cont/ArrayPortal.h

@@ -104,4 +104,4 @@ public:
 }
 } // namespace vtkm::cont
 
-#endif //vtkm_cont_ArrayPortal_h
+#endif //vtk_m_cont_ArrayPortal_h

vtkm/cont/Assert.h

@@ -61,4 +61,4 @@ VTKM_CONT_EXPORT void Assert(bool condition,
 }
 } // namespace vtkm::cont
 
-#endif //vtkm_cont_Assert_h
+#endif //vtk_m_cont_Assert_h

vtkm/cont/DeviceAdapter.h

@@ -70,4 +70,4 @@ namespace internal {
 } // namespace vtkm::cont
 
 
-#endif //vtkm_cont_DeviceAdapter_h
+#endif //vtk_m_cont_DeviceAdapter_h

vtkm/cont/DeviceAdapterSerial.h

@@ -24,4 +24,4 @@
 #include <vtkm/cont/internal/ArrayManagerExecutionSerial.h>
 #include <vtkm/cont/internal/DeviceAdapterAlgorithmSerial.h>
 
-#endif //vtkm_cont_DeviceAdapterSerial_h
+#endif //vtk_m_cont_DeviceAdapterSerial_h

vtkm/cont/Error.h

@@ -60,4 +60,4 @@ private:
 }
 } // namespace vtkm::cont
 
-#endif //vtkm_cont_Error_h
+#endif //vtk_m_cont_Error_h

vtkm/cont/ErrorControl.h

@@ -38,4 +38,4 @@ protected:
 }
 } // namespace vtkm::cont
 
-#endif //vtkm_cont_ErrorControl_h
+#endif //vtk_m_cont_ErrorControl_h

vtkm/cont/ErrorControlAssert.h

@@ -53,4 +53,4 @@ private:
 }
 }
 
-#endif //vtkm_cont_ErrorControlAssert_h
+#endif //vtk_m_cont_ErrorControlAssert_h

vtkm/cont/ErrorControlBadValue.h

@@ -38,4 +38,4 @@ public:
 }
 } // namespace vtkm::cont
 
-#endif //vtkm_cont_ErrorControlBadValue_h
+#endif //vtk_m_cont_ErrorControlBadValue_h

vtkm/cont/ErrorControlInternal.h

@@ -39,4 +39,4 @@ public:
 }
 } // namespace vtkm::cont
 
-#endif //vtkm_cont_ErrorControlInternal_h
+#endif //vtk_m_cont_ErrorControlInternal_h

vtkm/cont/ErrorControlOutOfMemory.h

@@ -38,4 +38,4 @@ public:
 }
 } // namespace vtkm::cont
 
-#endif //vtkm_cont_ErrorControlOutOfMemory_h
+#endif //vtk_m_cont_ErrorControlOutOfMemory_h

vtkm/cont/ErrorExecution.h

@@ -38,4 +38,4 @@ public:
 }
 }  // namespace vtkm::cont
 
-#endif //vtkm_cont_ErrorExecution_h
+#endif //vtk_m_cont_ErrorExecution_h

vtkm/cont/internal/ArrayHandleExecutionManager.h

@@ -284,4 +284,4 @@ private:
 }
 } // namespace vtkm::cont::internal
 
-#endif //vtkm_cont_exec_ArrayHandleExecutionManager_h
+#endif //vtk_m_cont_exec_ArrayHandleExecutionManager_h

vtkm/cont/internal/ArrayManagerExecution.h

@@ -169,4 +169,4 @@ public:
 // #include <vtkm/tbb/cont/internal/ArrayManagerExecutionTBB.h>
 #endif
 
-#endif //vtkm_cont_internal_ArrayManagerExecution_h
+#endif //vtk_m_cont_internal_ArrayManagerExecution_h

vtkm/cont/internal/ArrayManagerExecutionSerial.h

@@ -46,4 +46,4 @@ public:
 }
 } // namespace vtkm::cont::internal
 
-#endif //vtkm_cont_internal_ArrayManagerExecutionSerial_h
+#endif //vtk_m_cont_internal_ArrayManagerExecutionSerial_h

vtkm/cont/internal/ArrayManagerExecutionShareWithControl.h

@@ -174,4 +174,4 @@ private:
 }
 } // namespace vtkm::cont::internal
 
-#endif //vtkm_cont_internal_ArrayManagerExecutionShareWithControl_h
+#endif //vtk_m_cont_internal_ArrayManagerExecutionShareWithControl_h

vtkm/cont/internal/ArrayPortalFromIterators.h

@@ -102,4 +102,4 @@ private:
 }
 } // namespace vtkm::cont::internal
 
-#endif //vtkm_cont_internal_ArrayPortalFromIterators_h
+#endif //vtk_m_cont_internal_ArrayPortalFromIterators_h

vtkm/cont/internal/ArrayPortalShrink.h

@@ -123,4 +123,4 @@ private:
 }
 } // namespace vtkm::cont::internal
 
-#endif //vtkm_cont_internal_ArrayPortalShrink_h
+#endif //vtk_m_cont_internal_ArrayPortalShrink_h

vtkm/cont/internal/ArrayTransfer.h

@@ -190,4 +190,4 @@ private:
 }
 } // namespace vtkm::cont::internal
 
-#endif //vtkm_cont_internal_ArrayTransfer_h
+#endif //vtk_m_cont_internal_ArrayTransfer_h

vtkm/cont/internal/DeviceAdapterAlgorithm.h

@@ -406,4 +406,4 @@ public:
 // #include <vtkm/tbb/cont/internal/DeviceAdapterAlgorithmTBB.h>
 #endif
 
-#endif //vtkm_cont_DeviceAdapterAlgorithm_h
+#endif //vtk_m_cont_DeviceAdapterAlgorithm_h

vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h

@@ -1006,4 +1006,4 @@ public:
 }
 } // namespace vtkm::cont::internal
 
-#endif //vtkm_cont_internal_DeviceAdapterAlgorithmGeneral_h
+#endif //vtk_m_cont_internal_DeviceAdapterAlgorithmGeneral_h

vtkm/cont/internal/DeviceAdapterAlgorithmSerial.h

@@ -187,4 +187,4 @@ public:
 }
 } // namespace vtkm::cont
 
-#endif //vtkm_cont_internal_DeviceAdapterAlgorithmSerial_h
+#endif //vtk_m_cont_internal_DeviceAdapterAlgorithmSerial_h

vtkm/cont/internal/DeviceAdapterError.h

@@ -29,4 +29,4 @@
 ///
 VTKM_CREATE_DEVICE_ADAPTER(Error);
 
-#endif //vtkm_cont_internal_DeviceAdapterError_h
+#endif //vtk_m_cont_internal_DeviceAdapterError_h

vtkm/cont/internal/DeviceAdapterTag.h

@@ -109,4 +109,4 @@ struct DeviceAdapterTagCheck
 #endif
 
 
-#endif //vtkm_cont_internal_DeviceAdapterTag_h
+#endif //vtk_m_cont_internal_DeviceAdapterTag_h

vtkm/cont/internal/DeviceAdapterTagSerial.h

@@ -24,4 +24,4 @@
 
 VTKM_CREATE_DEVICE_ADAPTER(Serial);
 
-#endif //vtkm_cont_internal_DeviceAdapterTagSerial_h
+#endif //vtk_m_cont_internal_DeviceAdapterTagSerial_h

vtkm/cont/internal/IteratorFromArrayPortal.h

@@ -193,4 +193,4 @@ void swap( vtkm::cont::internal::detail::IteratorFromArrayPortalValue<T> a,
 }
 } // namespace vtkm::cont::internal
 
-#endif //vtkm_cont_internal_IteratorFromArrayPortal_h
+#endif //vtk_m_cont_internal_IteratorFromArrayPortal_h

vtkm/cont/testing/Testing.h

@@ -64,4 +64,4 @@ public:
 }
 } // namespace vtkm::cont::testing
 
-#endif //vtkm_cont_internal_Testing_h
+#endif //vtk_m_cont_internal_Testing_h

vtkm/cont/testing/TestingDeviceAdapter.h

@@ -1328,4 +1328,4 @@ public:
 }
 } // namespace vtkm::cont::testing
 
-#endif //vtkm_cont_testing_TestingDeviceAdapter_h
+#endif //vtk_m_cont_testing_TestingDeviceAdapter_h

vtkm/internal/ConfigureFor32.h

@@ -22,7 +22,7 @@
 //customize more of the vtkm type system, or what Device Adapters
 //need to be included look at vtkm/internal/Configure.h for all defines that
 //you can over-ride.
-#ifdef vtkm_internal_Configure_h
+#ifdef vtk_m_internal_Configure_h
 # error Incorrect header order. Include this header before any other VTKm headers.
 #endif
 

vtkm/internal/ConfigureFor64.h

@@ -22,7 +22,7 @@
 //customize more of the vtkm type system, or what Device Adapters
 //need to be included look at vtkm/internal/Configure.h for all defines that
 //you can over-ride.
-#ifdef vtkm_internal_Configure_h
+#ifdef vtk_m_internal_Configure_h
 # error Incorrect header order. Include this header before any other VTKm headers.
 #endif
 

vtkm/internal/ExportMacros.h

@@ -75,4 +75,4 @@
 #endif
 #endif
 
-#endif //vtkm_internal__ExportMacros_h
+#endif //vtk_m_internal__ExportMacros_h

vtkm/testing/Testing.h

@@ -33,7 +33,7 @@
 // Try to enforce using the correct testing version. (Those that include the
 // control environment have more possible exceptions.) This is not guaranteed
 // to work. To make it more likely, place the Testing.h include last.
-#ifdef vtkm_cont_Error_h
+#ifdef vtk_m_cont_Error_h
 #ifndef vtk_m_cont_testing_Testing_h
 #error Use vtkm::cont::testing::Testing instead of vtkm::testing::Testing.
 #else
@@ -342,4 +342,4 @@ std::ostream &operator<<(std::ostream &stream, const vtkm::Tuple<T,Size> &tuple)
   return stream << tuple[Size-1] << "]";
 }
 
-#endif //vtkm_testing_Testing_h
+#endif //vtk_m_testing_Testing_h