From 96ccf14c73f51e18017403b6d1167bd55a6c6ec1 Mon Sep 17 00:00:00 2001
From: Robert Maynard <robert.maynard@kitware.com>
Date: Mon, 15 Jan 2018 10:45:16 -0500
Subject: [PATCH] Correct bad formatting in some vtkm::cont headers

---
 vtkm/cont/ArrayHandleConcatenate.h  | 6 +++---
 vtkm/cont/ArrayHandlePermutation.h  | 6 +++---
 vtkm/cont/DataSetFieldAdd.h         | 1 -
 vtkm/cont/DeviceAdapterAlgorithm.h  | 4 ++--
 vtkm/cont/PointLocatorUniformGrid.h | 1 -
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/vtkm/cont/ArrayHandleConcatenate.h b/vtkm/cont/ArrayHandleConcatenate.h
index ed2489b1e..16ad249dc 100644
--- a/vtkm/cont/ArrayHandleConcatenate.h
+++ b/vtkm/cont/ArrayHandleConcatenate.h
@@ -19,8 +19,8 @@
 //  this software.
 //
 //=============================================================================
-#ifndef vtk_m_ArrayHandleConcatenate_h
-#define vtk_m_ArrayHandleConcatenate_h
+#ifndef vtk_m_cont_ArrayHandleConcatenate_h
+#define vtk_m_cont_ArrayHandleConcatenate_h
 
 #include <vtkm/cont/ArrayHandle.h>
 
@@ -323,4 +323,4 @@ VTKM_CONT ArrayHandleConcatenate<ArrayHandleType1, ArrayHandleType2> make_ArrayH
 }
 } // namespace vtkm::cont
 
-#endif //vtk_m_ArrayHandleConcatenate_h
+#endif //vtk_m_cont_ArrayHandleConcatenate_h
diff --git a/vtkm/cont/ArrayHandlePermutation.h b/vtkm/cont/ArrayHandlePermutation.h
index 7332d35f1..a78209917 100644
--- a/vtkm/cont/ArrayHandlePermutation.h
+++ b/vtkm/cont/ArrayHandlePermutation.h
@@ -19,8 +19,8 @@
 //  this software.
 //
 //=============================================================================
-#ifndef vtk_m_ArrayHandlePermutation_h
-#define vtk_m_ArrayHandlePermutation_h
+#ifndef vtk_m_cont_ArrayHandlePermutation_h
+#define vtk_m_cont_ArrayHandlePermutation_h
 
 #include <vtkm/cont/ArrayHandle.h>
 #include <vtkm/cont/ErrorBadType.h>
@@ -372,4 +372,4 @@ make_ArrayHandlePermutation(IndexArrayHandleType indexArray, ValueArrayHandleTyp
 }
 } // namespace vtkm::cont
 
-#endif //vtk_m_ArrayHandlePermutation_h
+#endif //vtk_m_cont_ArrayHandlePermutation_h
diff --git a/vtkm/cont/DataSetFieldAdd.h b/vtkm/cont/DataSetFieldAdd.h
index 779b8f06d..1332117b5 100644
--- a/vtkm/cont/DataSetFieldAdd.h
+++ b/vtkm/cont/DataSetFieldAdd.h
@@ -17,7 +17,6 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
-
 #ifndef vtk_m_cont_DataSetFieldAdd_h
 #define vtk_m_cont_DataSetFieldAdd_h
 
diff --git a/vtkm/cont/DeviceAdapterAlgorithm.h b/vtkm/cont/DeviceAdapterAlgorithm.h
index ccb042055..588f6f598 100644
--- a/vtkm/cont/DeviceAdapterAlgorithm.h
+++ b/vtkm/cont/DeviceAdapterAlgorithm.h
@@ -17,8 +17,8 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
-#ifndef vtk_m_cont_internal_DeviceAdapterAlgorithm_h
-#define vtk_m_cont_internal_DeviceAdapterAlgorithm_h
+#ifndef vtk_m_cont_DeviceAdapterAlgorithm_h
+#define vtk_m_cont_DeviceAdapterAlgorithm_h
 
 #include <vtkm/Types.h>
 
diff --git a/vtkm/cont/PointLocatorUniformGrid.h b/vtkm/cont/PointLocatorUniformGrid.h
index ea5c4f613..4af29b451 100644
--- a/vtkm/cont/PointLocatorUniformGrid.h
+++ b/vtkm/cont/PointLocatorUniformGrid.h
@@ -17,7 +17,6 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
-
 #ifndef vtk_m_cont_PointLocatorUniformGrid_h
 #define vtk_m_cont_PointLocatorUniformGrid_h