From 84ae1a0aba34ad8b80219fde57f00cdb4947ecaa Mon Sep 17 00:00:00 2001
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
Date: Thu, 27 Jan 2022 13:05:59 -0500
Subject: [PATCH] LCL: namespace its headers

---
 vtkm/CellShape.h                  | 3 +++
 vtkm/ErrorCode.h                  | 3 +++
 vtkm/exec/CellDerivative.h        | 3 +++
 vtkm/exec/CellInside.h            | 3 +++
 vtkm/exec/CellInterpolate.h       | 3 +++
 vtkm/exec/ParametricCoordinates.h | 3 +++
 6 files changed, 18 insertions(+)

diff --git a/vtkm/CellShape.h b/vtkm/CellShape.h
index 5985d1dc3..fc61f7c43 100644
--- a/vtkm/CellShape.h
+++ b/vtkm/CellShape.h
@@ -13,6 +13,8 @@
 #include <vtkm/StaticAssert.h>
 #include <vtkm/Types.h>
 
+namespace
+{
 #include <lcl/Polygon.h>
 #include <lcl/Shapes.h>
 
@@ -23,6 +25,7 @@ namespace lcl
 struct Empty;
 struct PolyLine;
 }
+}
 
 namespace vtkm
 {
diff --git a/vtkm/ErrorCode.h b/vtkm/ErrorCode.h
index d04e120ea..ae77de959 100644
--- a/vtkm/ErrorCode.h
+++ b/vtkm/ErrorCode.h
@@ -10,7 +10,10 @@
 #ifndef vtk_m_exec_ErrorCode_h
 #define vtk_m_exec_ErrorCode_h
 
+namespace
+{
 #include <lcl/ErrorCode.h>
+}
 
 #include <vtkm/internal/ExportMacros.h>
 namespace vtkm
diff --git a/vtkm/exec/CellDerivative.h b/vtkm/exec/CellDerivative.h
index 2afbba791..ee553ebfe 100644
--- a/vtkm/exec/CellDerivative.h
+++ b/vtkm/exec/CellDerivative.h
@@ -19,7 +19,10 @@
 #include <vtkm/exec/CellInterpolate.h>
 #include <vtkm/exec/FunctorBase.h>
 
+namespace
+{
 #include <lcl/lcl.h>
+}
 
 namespace vtkm
 {
diff --git a/vtkm/exec/CellInside.h b/vtkm/exec/CellInside.h
index 6be2f95a5..0fdc9b0eb 100644
--- a/vtkm/exec/CellInside.h
+++ b/vtkm/exec/CellInside.h
@@ -13,7 +13,10 @@
 #include <vtkm/CellShape.h>
 #include <vtkm/Types.h>
 
+namespace
+{
 #include <lcl/lcl.h>
+}
 
 namespace vtkm
 {
diff --git a/vtkm/exec/CellInterpolate.h b/vtkm/exec/CellInterpolate.h
index e2fb54256..8e9ad5900 100644
--- a/vtkm/exec/CellInterpolate.h
+++ b/vtkm/exec/CellInterpolate.h
@@ -16,7 +16,10 @@
 #include <vtkm/VecAxisAlignedPointCoordinates.h>
 #include <vtkm/exec/FunctorBase.h>
 
+namespace
+{
 #include <lcl/lcl.h>
+}
 
 #if (defined(VTKM_GCC) || defined(VTKM_CLANG))
 #pragma GCC diagnostic push
diff --git a/vtkm/exec/ParametricCoordinates.h b/vtkm/exec/ParametricCoordinates.h
index d33585420..e33dd3247 100644
--- a/vtkm/exec/ParametricCoordinates.h
+++ b/vtkm/exec/ParametricCoordinates.h
@@ -18,7 +18,10 @@
 #include <vtkm/exec/internal/FastVec.h>
 #include <vtkm/internal/Assume.h>
 
+namespace
+{
 #include <lcl/lcl.h>
+}
 
 namespace vtkm
 {
-- 
GitLab