Commit ed9cf46a authored by Kenneth Moreland's avatar Kenneth Moreland

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.
parent 9f7fcaf5
......@@ -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
......@@ -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
......@@ -221,4 +221,4 @@ VTKM_BASIC_TYPE_VECTOR(unsigned long long);
}
#endif //vtkm_VectorTraits_h
#endif //vtk_m_VectorTraits_h
......@@ -187,4 +187,4 @@ public:
#endif
#endif //vtkm_cont__ArrayContainerControl_h
#endif //vtk_m_cont__ArrayContainerControl_h
......@@ -181,4 +181,4 @@ private:
}
} // namespace vtkm::cont
#endif //vtkm_cont__ArrayContainerControlBasic_h
#endif //vtk_m_cont__ArrayContainerControlBasic_h
......@@ -222,4 +222,4 @@ private:
}
} // namespace vtkm::cont
#endif //vtkm_cont_ArrayContainerControlImplicit
#endif //vtk_m_cont_ArrayContainerControlImplicit
......@@ -556,4 +556,4 @@ make_ArrayHandle(const std::vector<T,Allocator> &array)
}
}
#endif //vtkm_cont_ArrayHandle_h
#endif //vtk_m_cont_ArrayHandle_h
......@@ -17,8 +17,8 @@
// Laboratory (LANL), the U.S. Government retains certain rights in
// this software.
//============================================================================
#ifndef vtkm_cont_ArrayHandleCounting_h
#define vtkm_cont_ArrayHandleCounting_h
#ifndef vtk_m_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
......@@ -104,4 +104,4 @@ public:
}
} // namespace vtkm::cont
#endif //vtkm_cont_ArrayPortal_h
#endif //vtk_m_cont_ArrayPortal_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
......@@ -70,4 +70,4 @@ namespace internal {
} // namespace vtkm::cont
#endif //vtkm_cont_DeviceAdapter_h
#endif //vtk_m_cont_DeviceAdapter_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
......@@ -60,4 +60,4 @@ private:
}
} // namespace vtkm::cont
#endif //vtkm_cont_Error_h
#endif //vtk_m_cont_Error_h
......@@ -38,4 +38,4 @@ protected:
}
} // namespace vtkm::cont
#endif //vtkm_cont_ErrorControl_h
#endif //vtk_m_cont_ErrorControl_h
......@@ -53,4 +53,4 @@ private:
}
}
#endif //vtkm_cont_ErrorControlAssert_h
#endif //vtk_m_cont_ErrorControlAssert_h
......@@ -38,4 +38,4 @@ public:
}
} // namespace vtkm::cont
#endif //vtkm_cont_ErrorControlBadValue_h
#endif //vtk_m_cont_ErrorControlBadValue_h
......@@ -39,4 +39,4 @@ public:
}
} // namespace vtkm::cont
#endif //vtkm_cont_ErrorControlInternal_h
#endif //vtk_m_cont_ErrorControlInternal_h
......@@ -38,4 +38,4 @@ public:
}
} // namespace vtkm::cont
#endif //vtkm_cont_ErrorControlOutOfMemory_h
#endif //vtk_m_cont_ErrorControlOutOfMemory_h
......@@ -38,4 +38,4 @@ public:
}
} // namespace vtkm::cont
#endif //vtkm_cont_ErrorExecution_h
#endif //vtk_m_cont_ErrorExecution_h
......@@ -284,4 +284,4 @@ private:
}
} // namespace vtkm::cont::internal
#endif //vtkm_cont_exec_ArrayHandleExecutionManager_h
#endif //vtk_m_cont_exec_ArrayHandleExecutionManager_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
......@@ -46,4 +46,4 @@ public:
}
} // namespace vtkm::cont::internal
#endif //vtkm_cont_internal_ArrayManagerExecutionSerial_h
#endif //vtk_m_cont_internal_ArrayManagerExecutionSerial_h
......@@ -174,4 +174,4 @@ private:
}
} // namespace vtkm::cont::internal
#endif //vtkm_cont_internal_ArrayManagerExecutionShareWithControl_h
#endif //vtk_m_cont_internal_ArrayManagerExecutionShareWithControl_h
......@@ -102,4 +102,4 @@ private:
}
} // namespace vtkm::cont::internal
#endif //vtkm_cont_internal_ArrayPortalFromIterators_h
#endif //vtk_m_cont_internal_ArrayPortalFromIterators_h
......@@ -123,4 +123,4 @@ private:
}
} // namespace vtkm::cont::internal
#endif //vtkm_cont_internal_ArrayPortalShrink_h
#endif //vtk_m_cont_internal_ArrayPortalShrink_h
......@@ -190,4 +190,4 @@ private:
}
} // namespace vtkm::cont::internal
#endif //vtkm_cont_internal_ArrayTransfer_h
#endif //vtk_m_cont_internal_ArrayTransfer_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
......@@ -1006,4 +1006,4 @@ public:
}
} // namespace vtkm::cont::internal
#endif //vtkm_cont_internal_DeviceAdapterAlgorithmGeneral_h
#endif //vtk_m_cont_internal_DeviceAdapterAlgorithmGeneral_h
......@@ -187,4 +187,4 @@ public:
}
} // namespace vtkm::cont
#endif //vtkm_cont_internal_DeviceAdapterAlgorithmSerial_h
#endif //vtk_m_cont_internal_DeviceAdapterAlgorithmSerial_h
......@@ -29,4 +29,4 @@
///
VTKM_CREATE_DEVICE_ADAPTER(Error);
#endif //vtkm_cont_internal_DeviceAdapterError_h
#endif //vtk_m_cont_internal_DeviceAdapterError_h
......@@ -109,4 +109,4 @@ struct DeviceAdapterTagCheck
#endif
#endif //vtkm_cont_internal_DeviceAdapterTag_h
#endif //vtk_m_cont_internal_DeviceAdapterTag_h
......@@ -24,4 +24,4 @@
VTKM_CREATE_DEVICE_ADAPTER(Serial);
#endif //vtkm_cont_internal_DeviceAdapterTagSerial_h
#endif //vtk_m_cont_internal_DeviceAdapterTagSerial_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
......@@ -64,4 +64,4 @@ public:
}
} // namespace vtkm::cont::testing
#endif //vtkm_cont_internal_Testing_h
#endif //vtk_m_cont_internal_Testing_h
......@@ -1328,4 +1328,4 @@ public:
}
} // namespace vtkm::cont::testing
#endif //vtkm_cont_testing_TestingDeviceAdapter_h
#endif //vtk_m_cont_testing_TestingDeviceAdapter_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
......
......@@ -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
......
......@@ -75,4 +75,4 @@
#endif
#endif
#endif //vtkm_internal__ExportMacros_h
#endif //vtk_m_internal__ExportMacros_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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment