From 7f6bffe5ad0d3f2659e95038b8b67600f7ce8ffa Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Sat, 13 Jan 2018 00:11:30 +0000
Subject: [PATCH] NAMESPACE

---
 lib/stencil/Lebesgue.cc        | 5 +++--
 lib/stencil/Lebesgue.h         | 6 ++++--
 lib/stencil/SimpleCompressor.h | 5 +++--
 lib/stencil/Stencil.cc         | 5 +++--
 lib/stencil/Stencil.h          | 5 +++--
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/lib/stencil/Lebesgue.cc b/lib/stencil/Lebesgue.cc
index 2880e4b6..bd8ed3ad 100644
--- a/lib/stencil/Lebesgue.cc
+++ b/lib/stencil/Lebesgue.cc
@@ -29,7 +29,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 #include <Grid/GridCore.h>
 #include <algorithm>
 
-namespace Grid {
+NAMESPACE_BEGIN(Grid);
 
 int LebesgueOrder::UseLebesgueOrder;
 #ifdef KNL
@@ -239,4 +239,5 @@ void LebesgueOrder::ZGraph(void)
   }
   */
 }
-}
+NAMESPACE_END(Grid);
+
diff --git a/lib/stencil/Lebesgue.h b/lib/stencil/Lebesgue.h
index 7db0cc6b..32287487 100644
--- a/lib/stencil/Lebesgue.h
+++ b/lib/stencil/Lebesgue.h
@@ -32,7 +32,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 #include<vector>
 
 // Lebesgue, Morton, Z-graph ordering assistance
-namespace Grid {
+NAMESPACE_BEGIN(Grid);
   
   class LebesgueOrder { 
   public:
@@ -76,5 +76,7 @@ namespace Grid {
     std::vector<IndexInteger> _LebesgueReorder;
 
   };    
-}
+
+NAMESPACE_END(Grid);
+
 #endif
diff --git a/lib/stencil/SimpleCompressor.h b/lib/stencil/SimpleCompressor.h
index 58c3bcd2..f4f096de 100644
--- a/lib/stencil/SimpleCompressor.h
+++ b/lib/stencil/SimpleCompressor.h
@@ -1,7 +1,7 @@
 #ifndef _STENCIL_SIMPLE_COMPRESSOR_H_
 #define _STENCIL_SIMPLE_COMPRESSOR_H_
 
-namespace Grid {
+NAMESPACE_BEGIN(Grid);
 
 template<class vobj>
 class SimpleCompressor {
@@ -25,5 +25,6 @@ public:
   }
 };
 
-}
+NAMESPACE_END(Grid);
+
 #endif
diff --git a/lib/stencil/Stencil.cc b/lib/stencil/Stencil.cc
index e04a5360..9cd6a9ab 100644
--- a/lib/stencil/Stencil.cc
+++ b/lib/stencil/Stencil.cc
@@ -27,7 +27,7 @@
      /*  END LEGAL */
 #include <Grid/GridCore.h>
 
-namespace Grid {
+NAMESPACE_BEGIN(Grid);
 
 void Gather_plane_table_compute (GridBase *grid,int dimension,int plane,int cbmask,
 					int off,std::vector<std::pair<int,int> > & table)
@@ -66,4 +66,5 @@ void Gather_plane_table_compute (GridBase *grid,int dimension,int plane,int cbma
   }
 }
 
-}
+NAMESPACE_END(Grid);
+
diff --git a/lib/stencil/Stencil.h b/lib/stencil/Stencil.h
index 69c010f4..ef35e100 100644
--- a/lib/stencil/Stencil.h
+++ b/lib/stencil/Stencil.h
@@ -48,7 +48,7 @@
  // 
  //////////////////////////////////////////////////////////////////////////////////////////
 
-namespace Grid {
+NAMESPACE_BEGIN(Grid);
 
 ///////////////////////////////////////////////////////////////////
 // Gather for when there *is* need to SIMD split with compression
@@ -1164,5 +1164,6 @@ class CartesianStencil { // Stencil runs along coordinate axes only; NO diagonal
   };
   
 };
-}
+NAMESPACE_END(Grid);
+
 #endif