From 2b7a0e0490695cf44b129a756329685745969118 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Fri, 7 Mar 2014 10:19:09 -0500 Subject: [PATCH] revise the header guard naming convention to not conflict with macro names. --- docs/CodingConventions.md | 11 +++++++---- vtkm/TypeTraits.h | 4 ++-- vtkm/Types.h | 5 +++-- vtkm/VectorTraits.h | 4 ++-- vtkm/cont/ArrayContainerControl.h | 4 ++-- vtkm/cont/ArrayContainerControlBasic.h | 4 ++-- vtkm/cont/ArrayContainerControlImplicit.h | 4 ++-- vtkm/cont/ArrayHandle.h | 5 +++-- vtkm/cont/ArrayPortal.h | 4 ++-- vtkm/cont/Assert.h | 4 ++-- vtkm/cont/DeviceAdapter.h | 4 ++-- vtkm/cont/DeviceAdapterSerial.h | 4 ++-- vtkm/cont/Error.h | 4 ++-- vtkm/cont/ErrorControl.h | 4 ++-- vtkm/cont/ErrorControlAssert.h | 4 ++-- vtkm/cont/ErrorControlBadValue.h | 4 ++-- vtkm/cont/ErrorControlInternal.h | 4 ++-- vtkm/cont/ErrorControlOutOfMemory.h | 4 ++-- vtkm/cont/ErrorExecution.h | 4 ++-- vtkm/cont/internal/ArrayHandleExecutionManager.h | 4 ++-- vtkm/cont/internal/ArrayManagerExecution.h | 4 ++-- vtkm/cont/internal/ArrayManagerExecutionSerial.h | 4 ++-- .../internal/ArrayManagerExecutionShareWithControl.h | 4 ++-- vtkm/cont/internal/ArrayPortalFromIterators.h | 4 ++-- vtkm/cont/internal/ArrayPortalShrink.h | 4 ++-- vtkm/cont/internal/ArrayTransfer.h | 4 ++-- vtkm/cont/internal/DeviceAdapterAlgorithm.h | 4 ++-- vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h | 4 ++-- vtkm/cont/internal/DeviceAdapterAlgorithmSerial.h | 4 ++-- vtkm/cont/internal/DeviceAdapterError.h | 4 ++-- vtkm/cont/internal/DeviceAdapterTag.h | 4 ++-- vtkm/cont/internal/DeviceAdapterTagSerial.h | 4 ++-- vtkm/cont/internal/IteratorFromArrayPortal.h | 4 ++-- vtkm/cont/testing/Testing.h | 4 ++-- vtkm/cont/testing/TestingDeviceAdapter.h | 4 ++-- vtkm/internal/Configure.h.in | 4 ++-- vtkm/internal/ConfigureFor32.h | 4 ++-- vtkm/internal/ConfigureFor64.h | 4 ++-- vtkm/internal/ExportMacros.h | 4 ++-- vtkm/testing/Testing.h | 6 +++--- 40 files changed, 88 insertions(+), 83 deletions(-) diff --git a/docs/CodingConventions.md b/docs/CodingConventions.md index 5627acd24..266ebf3dd 100644 --- a/docs/CodingConventions.md +++ b/docs/CodingConventions.md @@ -31,17 +31,20 @@ The statement should have the following form: + The CopyrightStatement checks all files for a similar statement. The test will print out a suggested text that can be copied and pasted to any file that has a missing copyright statement (with appropriate replacement of comment prefix). Exceptions to this copyright statement (for example, third-party files with different but compatible statements) can be added to LICENSE.txt. -+ All include files should use include guards. starting right after the copyright statement. The naming convention of the include guard macro is that it should be all in lower case and start with the path name, starting from the top-level source code directory, with non alphanumeric characters, such as / and . replaced with underscores. The #endif part of the guard at the bottom of the file should include the guard name in a comment. For example, the vtkm/cont/ArrayHandle.h header contains the guard ++ All include files should use include guards. starting right after the copyright statement. The naming convention of the include guard macro is that it should be all in lower case and start with vtk_m and than continue the path name, starting from the inside the vtkm source code directory, with non alphanumeric characters, such as / and . replaced with underscores. The #endif part of the guard at the bottom of the file should include the guard name in a comment. + For example, the vtkm/cont/ArrayHandle.h header contains the guard ```cpp - #ifndef vtkm_cont_ArrayHandle_h - #define vtkm_cont_ArrayHandle_h + #ifndef vtk_m_cont_ArrayHandle_h + #define vtk_m_cont_ArrayHandle_h ``` at the top and ```cpp - #endif //vtkm_cont_ArrayHandle_h + #endif //vtk_m_cont_ArrayHandle_h ``` at the bottom. +The unique use of vtk_m over vtkm is to allow auto-complete engines the ability to differentiate between the header guards and VTKM_ macros that are used within the code base. + + The VTK-M toolkit has several nested namespaces. The declaration of each namespace should be on its own line, and the code inside the namespace bracket should not be indented. The closing brace at the bottom of the namespace should be documented with a comment identifying the namespace. Namespaces can be grouped as desired. The following is a valid use of namespaces. ```cpp namespace vtkm { diff --git a/vtkm/TypeTraits.h b/vtkm/TypeTraits.h index 56a72247f..64694e2d0 100644 --- a/vtkm/TypeTraits.h +++ b/vtkm/TypeTraits.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_TypeTraits_h -#define vtkm_TypeTraits_h +#ifndef vtk_m_TypeTraits_h +#define vtk_m_TypeTraits_h #include diff --git a/vtkm/Types.h b/vtkm/Types.h index 7373f2596..d13a9b186 100644 --- a/vtkm/Types.h +++ b/vtkm/Types.h @@ -17,8 +17,9 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_Types_h -#define vtkm_Types_h +#ifndef vtk_m_Types_h +#define vtk_m_Types_h + #include #include diff --git a/vtkm/VectorTraits.h b/vtkm/VectorTraits.h index 2f79c2914..b19743aae 100644 --- a/vtkm/VectorTraits.h +++ b/vtkm/VectorTraits.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_VectorTraits_h -#define vtkm_VectorTraits_h +#ifndef vtk_m_VectorTraits_h +#define vtk_m_VectorTraits_h #include diff --git a/vtkm/cont/ArrayContainerControl.h b/vtkm/cont/ArrayContainerControl.h index 328d8193c..7caa10670 100644 --- a/vtkm/cont/ArrayContainerControl.h +++ b/vtkm/cont/ArrayContainerControl.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont__ArrayContainerControl_h -#define vtkm_cont__ArrayContainerControl_h +#ifndef vtk_m_cont__ArrayContainerControl_h +#define vtk_m_cont__ArrayContainerControl_h #define VTKM_ARRAY_CONTAINER_CONTROL_ERROR -1 #define VTKM_ARRAY_CONTAINER_CONTROL_UNDEFINED 0 diff --git a/vtkm/cont/ArrayContainerControlBasic.h b/vtkm/cont/ArrayContainerControlBasic.h index 7f01a1997..1763324e5 100644 --- a/vtkm/cont/ArrayContainerControlBasic.h +++ b/vtkm/cont/ArrayContainerControlBasic.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont__ArrayContainerControlBasic_h -#define vtkm_cont__ArrayContainerControlBasic_h +#ifndef vtk_m_cont__ArrayContainerControlBasic_h +#define vtk_m_cont__ArrayContainerControlBasic_h #include #include diff --git a/vtkm/cont/ArrayContainerControlImplicit.h b/vtkm/cont/ArrayContainerControlImplicit.h index 420494da3..4acb1c682 100644 --- a/vtkm/cont/ArrayContainerControlImplicit.h +++ b/vtkm/cont/ArrayContainerControlImplicit.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_ArrayContainerControlImplicit -#define vtkm_cont_ArrayContainerControlImplicit +#ifndef vtk_m_cont_ArrayContainerControlImplicit +#define vtk_m_cont_ArrayContainerControlImplicit #include diff --git a/vtkm/cont/ArrayHandle.h b/vtkm/cont/ArrayHandle.h index 66ff38a83..1ddba28db 100644 --- a/vtkm/cont/ArrayHandle.h +++ b/vtkm/cont/ArrayHandle.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_ArrayHandle_h -#define vtkm_cont_ArrayHandle_h +#ifndef vtk_m_cont_ArrayHandle_h +#define vtk_m_cont_ArrayHandle_h #include @@ -61,6 +61,7 @@ namespace internal { class ArrayHandleAccess; } /// counted so that when all copies of the \c ArrayHandle are destroyed, any /// allocated memory is released. /// +/// template< typename T, typename ArrayContainerControlTag_ = VTKM_DEFAULT_ARRAY_CONTAINER_CONTROL_TAG> diff --git a/vtkm/cont/ArrayPortal.h b/vtkm/cont/ArrayPortal.h index 618b3ba98..2197fcdd9 100644 --- a/vtkm/cont/ArrayPortal.h +++ b/vtkm/cont/ArrayPortal.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_ArrayPortal_h -#define vtkm_cont_ArrayPortal_h +#ifndef vtk_m_cont_ArrayPortal_h +#define vtk_m_cont_ArrayPortal_h #include diff --git a/vtkm/cont/Assert.h b/vtkm/cont/Assert.h index b5adfe725..52063188b 100644 --- a/vtkm/cont/Assert.h +++ b/vtkm/cont/Assert.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_Assert_h -#define vtkm_cont_Assert_h +#ifndef vtk_m_cont_Assert_h +#define vtk_m_cont_Assert_h #include diff --git a/vtkm/cont/DeviceAdapter.h b/vtkm/cont/DeviceAdapter.h index 1ffa6f505..3a7f71f2e 100644 --- a/vtkm/cont/DeviceAdapter.h +++ b/vtkm/cont/DeviceAdapter.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_DeviceAdapter_h -#define vtkm_cont_DeviceAdapter_h +#ifndef vtk_m_cont_DeviceAdapter_h +#define vtk_m_cont_DeviceAdapter_h // These are listed in non-alphabetical order because this is the conceptual // order in which the sub-files are loaded. (But the compile should still diff --git a/vtkm/cont/DeviceAdapterSerial.h b/vtkm/cont/DeviceAdapterSerial.h index e0ee147ad..1b2d030ff 100644 --- a/vtkm/cont/DeviceAdapterSerial.h +++ b/vtkm/cont/DeviceAdapterSerial.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_DeviceAdapterSerial_h -#define vtkm_cont_DeviceAdapterSerial_h +#ifndef vtk_m_cont_DeviceAdapterSerial_h +#define vtk_m_cont_DeviceAdapterSerial_h #include #include diff --git a/vtkm/cont/Error.h b/vtkm/cont/Error.h index 1fbe0db96..b9d322da6 100644 --- a/vtkm/cont/Error.h +++ b/vtkm/cont/Error.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_Error_h -#define vtkm_cont_Error_h +#ifndef vtk_m_cont_Error_h +#define vtk_m_cont_Error_h // Note that this class and (most likely) all of its subclasses are not // templated. If there is any reason to create a VTKm control library, diff --git a/vtkm/cont/ErrorControl.h b/vtkm/cont/ErrorControl.h index 53f22ae04..1e6152a3d 100644 --- a/vtkm/cont/ErrorControl.h +++ b/vtkm/cont/ErrorControl.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_ErrorControl_h -#define vtkm_cont_ErrorControl_h +#ifndef vtk_m_cont_ErrorControl_h +#define vtk_m_cont_ErrorControl_h #include diff --git a/vtkm/cont/ErrorControlAssert.h b/vtkm/cont/ErrorControlAssert.h index 81f5ae314..7019234fa 100644 --- a/vtkm/cont/ErrorControlAssert.h +++ b/vtkm/cont/ErrorControlAssert.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_ErrorControlAssert_h -#define vtkm_cont_ErrorControlAssert_h +#ifndef vtk_m_cont_ErrorControlAssert_h +#define vtk_m_cont_ErrorControlAssert_h #include #include diff --git a/vtkm/cont/ErrorControlBadValue.h b/vtkm/cont/ErrorControlBadValue.h index ebf07292f..1221fcba7 100644 --- a/vtkm/cont/ErrorControlBadValue.h +++ b/vtkm/cont/ErrorControlBadValue.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_ErrorControlBadValue_h -#define vtkm_cont_ErrorControlBadValue_h +#ifndef vtk_m_cont_ErrorControlBadValue_h +#define vtk_m_cont_ErrorControlBadValue_h #include diff --git a/vtkm/cont/ErrorControlInternal.h b/vtkm/cont/ErrorControlInternal.h index 4a03df8f0..cfa85c2ea 100644 --- a/vtkm/cont/ErrorControlInternal.h +++ b/vtkm/cont/ErrorControlInternal.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_ErrorControlInternal_h -#define vtkm_cont_ErrorControlInternal_h +#ifndef vtk_m_cont_ErrorControlInternal_h +#define vtk_m_cont_ErrorControlInternal_h #include diff --git a/vtkm/cont/ErrorControlOutOfMemory.h b/vtkm/cont/ErrorControlOutOfMemory.h index 6c4e98593..c2b82ae2f 100644 --- a/vtkm/cont/ErrorControlOutOfMemory.h +++ b/vtkm/cont/ErrorControlOutOfMemory.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_ErrorControlOutOfMemory_h -#define vtkm_cont_ErrorControlOutOfMemory_h +#ifndef vtk_m_cont_ErrorControlOutOfMemory_h +#define vtk_m_cont_ErrorControlOutOfMemory_h #include diff --git a/vtkm/cont/ErrorExecution.h b/vtkm/cont/ErrorExecution.h index 14ad9bca6..10fa6a27b 100644 --- a/vtkm/cont/ErrorExecution.h +++ b/vtkm/cont/ErrorExecution.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_ErrorExecution_h -#define vtkm_cont_ErrorExecution_h +#ifndef vtk_m_cont_ErrorExecution_h +#define vtk_m_cont_ErrorExecution_h #include diff --git a/vtkm/cont/internal/ArrayHandleExecutionManager.h b/vtkm/cont/internal/ArrayHandleExecutionManager.h index ca25ede5e..c0c3babab 100644 --- a/vtkm/cont/internal/ArrayHandleExecutionManager.h +++ b/vtkm/cont/internal/ArrayHandleExecutionManager.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_exec_ArrayHandleExecutionManager_h -#define vtkm_cont_exec_ArrayHandleExecutionManager_h +#ifndef vtk_m_cont_exec_ArrayHandleExecutionManager_h +#define vtk_m_cont_exec_ArrayHandleExecutionManager_h #include #include diff --git a/vtkm/cont/internal/ArrayManagerExecution.h b/vtkm/cont/internal/ArrayManagerExecution.h index 81f1e0b9d..f5e14ec8d 100644 --- a/vtkm/cont/internal/ArrayManagerExecution.h +++ b/vtkm/cont/internal/ArrayManagerExecution.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_internal_ArrayManagerExecution_h -#define vtkm_cont_internal_ArrayManagerExecution_h +#ifndef vtk_m_cont_internal_ArrayManagerExecution_h +#define vtk_m_cont_internal_ArrayManagerExecution_h #include diff --git a/vtkm/cont/internal/ArrayManagerExecutionSerial.h b/vtkm/cont/internal/ArrayManagerExecutionSerial.h index ffefbc311..051d1955d 100644 --- a/vtkm/cont/internal/ArrayManagerExecutionSerial.h +++ b/vtkm/cont/internal/ArrayManagerExecutionSerial.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_internal_ArrayManagerExecutionSerial_h -#define vtkm_cont_internal_ArrayManagerExecutionSerial_h +#ifndef vtk_m_cont_internal_ArrayManagerExecutionSerial_h +#define vtk_m_cont_internal_ArrayManagerExecutionSerial_h #include #include diff --git a/vtkm/cont/internal/ArrayManagerExecutionShareWithControl.h b/vtkm/cont/internal/ArrayManagerExecutionShareWithControl.h index 33df30c11..4adb54566 100644 --- a/vtkm/cont/internal/ArrayManagerExecutionShareWithControl.h +++ b/vtkm/cont/internal/ArrayManagerExecutionShareWithControl.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_internal_ArrayManagerExecutionShareWithControl_h -#define vtkm_cont_internal_ArrayManagerExecutionShareWithControl_h +#ifndef vtk_m_cont_internal_ArrayManagerExecutionShareWithControl_h +#define vtk_m_cont_internal_ArrayManagerExecutionShareWithControl_h #include diff --git a/vtkm/cont/internal/ArrayPortalFromIterators.h b/vtkm/cont/internal/ArrayPortalFromIterators.h index 24ab65360..17c311e6b 100644 --- a/vtkm/cont/internal/ArrayPortalFromIterators.h +++ b/vtkm/cont/internal/ArrayPortalFromIterators.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_internal_ArrayPortalFromIterators_h -#define vtkm_cont_internal_ArrayPortalFromIterators_h +#ifndef vtk_m_cont_internal_ArrayPortalFromIterators_h +#define vtk_m_cont_internal_ArrayPortalFromIterators_h #include #include diff --git a/vtkm/cont/internal/ArrayPortalShrink.h b/vtkm/cont/internal/ArrayPortalShrink.h index a791ad48b..5484e3af1 100644 --- a/vtkm/cont/internal/ArrayPortalShrink.h +++ b/vtkm/cont/internal/ArrayPortalShrink.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_internal_ArrayPortalShrink_h -#define vtkm_cont_internal_ArrayPortalShrink_h +#ifndef vtk_m_cont_internal_ArrayPortalShrink_h +#define vtk_m_cont_internal_ArrayPortalShrink_h #include #include diff --git a/vtkm/cont/internal/ArrayTransfer.h b/vtkm/cont/internal/ArrayTransfer.h index a7e5457c6..cf7f59c55 100644 --- a/vtkm/cont/internal/ArrayTransfer.h +++ b/vtkm/cont/internal/ArrayTransfer.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_internal_ArrayTransfer_h -#define vtkm_cont_internal_ArrayTransfer_h +#ifndef vtk_m_cont_internal_ArrayTransfer_h +#define vtk_m_cont_internal_ArrayTransfer_h #include #include diff --git a/vtkm/cont/internal/DeviceAdapterAlgorithm.h b/vtkm/cont/internal/DeviceAdapterAlgorithm.h index 7e64b2185..c26bd3ca8 100644 --- a/vtkm/cont/internal/DeviceAdapterAlgorithm.h +++ b/vtkm/cont/internal/DeviceAdapterAlgorithm.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_internal_DeviceAdapterAlgorithm_h -#define vtkm_cont_internal_DeviceAdapterAlgorithm_h +#ifndef vtk_m_cont_internal_DeviceAdapterAlgorithm_h +#define vtk_m_cont_internal_DeviceAdapterAlgorithm_h #include diff --git a/vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h b/vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h index 57191b493..d44d3c621 100644 --- a/vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h +++ b/vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_internal_DeviceAdapterAlgorithmGeneral_h -#define vtkm_cont_internal_DeviceAdapterAlgorithmGeneral_h +#ifndef vtk_m_cont_internal_DeviceAdapterAlgorithmGeneral_h +#define vtk_m_cont_internal_DeviceAdapterAlgorithmGeneral_h #include #include diff --git a/vtkm/cont/internal/DeviceAdapterAlgorithmSerial.h b/vtkm/cont/internal/DeviceAdapterAlgorithmSerial.h index ae9df6cf9..1cfea871c 100644 --- a/vtkm/cont/internal/DeviceAdapterAlgorithmSerial.h +++ b/vtkm/cont/internal/DeviceAdapterAlgorithmSerial.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_internal_DeviceAdapterAlgorithmSerial_h -#define vtkm_cont_internal_DeviceAdapterAlgorithmSerial_h +#ifndef vtk_m_cont_internal_DeviceAdapterAlgorithmSerial_h +#define vtk_m_cont_internal_DeviceAdapterAlgorithmSerial_h #include #include diff --git a/vtkm/cont/internal/DeviceAdapterError.h b/vtkm/cont/internal/DeviceAdapterError.h index e251f80a9..438095ad8 100644 --- a/vtkm/cont/internal/DeviceAdapterError.h +++ b/vtkm/cont/internal/DeviceAdapterError.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_internal_DeviceAdapterError_h -#define vtkm_cont_internal_DeviceAdapterError_h +#ifndef vtk_m_cont_internal_DeviceAdapterError_h +#define vtk_m_cont_internal_DeviceAdapterError_h #include diff --git a/vtkm/cont/internal/DeviceAdapterTag.h b/vtkm/cont/internal/DeviceAdapterTag.h index f755831fa..1786cb76a 100644 --- a/vtkm/cont/internal/DeviceAdapterTag.h +++ b/vtkm/cont/internal/DeviceAdapterTag.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_internal_DeviceAdapterTag_h -#define vtkm_cont_internal_DeviceAdapterTag_h +#ifndef vtk_m_cont_internal_DeviceAdapterTag_h +#define vtk_m_cont_internal_DeviceAdapterTag_h #include #include diff --git a/vtkm/cont/internal/DeviceAdapterTagSerial.h b/vtkm/cont/internal/DeviceAdapterTagSerial.h index 47b5d0791..ebf5d6c72 100644 --- a/vtkm/cont/internal/DeviceAdapterTagSerial.h +++ b/vtkm/cont/internal/DeviceAdapterTagSerial.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_internal_DeviceAdapterTagSerial_h -#define vtkm_cont_internal_DeviceAdapterTagSerial_h +#ifndef vtk_m_cont_internal_DeviceAdapterTagSerial_h +#define vtk_m_cont_internal_DeviceAdapterTagSerial_h #include diff --git a/vtkm/cont/internal/IteratorFromArrayPortal.h b/vtkm/cont/internal/IteratorFromArrayPortal.h index 3f035317a..f8610a946 100644 --- a/vtkm/cont/internal/IteratorFromArrayPortal.h +++ b/vtkm/cont/internal/IteratorFromArrayPortal.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_internal_IteratorFromArrayPortal_h -#define vtkm_cont_internal_IteratorFromArrayPortal_h +#ifndef vtk_m_cont_internal_IteratorFromArrayPortal_h +#define vtk_m_cont_internal_IteratorFromArrayPortal_h #include diff --git a/vtkm/cont/testing/Testing.h b/vtkm/cont/testing/Testing.h index b971bd241..4f6ac5fda 100644 --- a/vtkm/cont/testing/Testing.h +++ b/vtkm/cont/testing/Testing.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_testing_Testing_h -#define vtkm_cont_testing_Testing_h +#ifndef vtk_m_cont_testing_Testing_h +#define vtk_m_cont_testing_Testing_h #include diff --git a/vtkm/cont/testing/TestingDeviceAdapter.h b/vtkm/cont/testing/TestingDeviceAdapter.h index 76755b710..8181607b6 100644 --- a/vtkm/cont/testing/TestingDeviceAdapter.h +++ b/vtkm/cont/testing/TestingDeviceAdapter.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_cont_testing_TestingDeviceAdapter_h -#define vtkm_cont_testing_TestingDeviceAdapter_h +#ifndef vtk_m_cont_testing_TestingDeviceAdapter_h +#define vtk_m_cont_testing_TestingDeviceAdapter_h #include #include diff --git a/vtkm/internal/Configure.h.in b/vtkm/internal/Configure.h.in index a5ca5b3b3..fd5e78789 100644 --- a/vtkm/internal/Configure.h.in +++ b/vtkm/internal/Configure.h.in @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_internal_Configure_h -#define vtkm_internal_Configure_h +#ifndef vtk_m_internal_Configure_h +#define vtk_m_internal_Configure_h #if !defined(VTKM_USE_DOUBLE_PRECISION) && !defined(VTKM_NO_DOUBLE_PRECISION) diff --git a/vtkm/internal/ConfigureFor32.h b/vtkm/internal/ConfigureFor32.h index 81405be35..f9e196eba 100644 --- a/vtkm/internal/ConfigureFor32.h +++ b/vtkm/internal/ConfigureFor32.h @@ -26,8 +26,8 @@ # error Incorrect header order. Include this header before any other VTKm headers. #endif -#ifndef vtkm_internal_Configure32_h -#define vtkm_internal_Configure32_h +#ifndef vtk_m_internal_Configure32_h +#define vtk_m_internal_Configure32_h #define VTKM_NO_DOUBLE_PRECISION #define VTKM_NO_64BIT_IDS diff --git a/vtkm/internal/ConfigureFor64.h b/vtkm/internal/ConfigureFor64.h index f56d8fdd2..9e747879e 100644 --- a/vtkm/internal/ConfigureFor64.h +++ b/vtkm/internal/ConfigureFor64.h @@ -26,8 +26,8 @@ # error Incorrect header order. Include this header before any other VTKm headers. #endif -#ifndef vtkm_internal_Configure32_h -#define vtkm_internal_Configure32_h +#ifndef vtk_m_internal_Configure32_h +#define vtk_m_internal_Configure32_h #define VTKM_USE_DOUBLE_PRECISION #define VTKM_USE_64BIT_IDS diff --git a/vtkm/internal/ExportMacros.h b/vtkm/internal/ExportMacros.h index b83ac474a..7403a1be9 100644 --- a/vtkm/internal/ExportMacros.h +++ b/vtkm/internal/ExportMacros.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_internal__ExportMacros_h -#define vtkm_internal__ExportMacros_h +#ifndef vtk_m_internal__ExportMacros_h +#define vtk_m_internal__ExportMacros_h /*! * Export macros for various parts of the VTKm library. diff --git a/vtkm/testing/Testing.h b/vtkm/testing/Testing.h index 46f4b6c7c..8fa3667b8 100644 --- a/vtkm/testing/Testing.h +++ b/vtkm/testing/Testing.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtkm_testing_Testing_h -#define vtkm_testing_Testing_h +#ifndef vtk_m_testing_Testing_h +#define vtk_m_testing_Testing_h #include #include @@ -34,7 +34,7 @@ // 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 -#ifndef vtkm_cont_testing_Testing_h +#ifndef vtk_m_cont_testing_Testing_h #error Use vtkm::cont::testing::Testing instead of vtkm::testing::Testing. #else #define VTKM_TESTING_IN_CONT