From 645ec8eba0b7e698a99103f952da723f26702a20 Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Sun, 14 Jan 2018 23:52:26 +0000
Subject: [PATCH] Namespace

---
 lib/lattice/Lattice_unary.h | 93 +++++++++++++++++--------------------
 1 file changed, 43 insertions(+), 50 deletions(-)

diff --git a/lib/lattice/Lattice_unary.h b/lib/lattice/Lattice_unary.h
index 44b7b4f1..c90db113 100644
--- a/lib/lattice/Lattice_unary.h
+++ b/lib/lattice/Lattice_unary.h
@@ -1,4 +1,4 @@
-    /*************************************************************************************
+/*************************************************************************************
 
     Grid physics library, www.github.com/paboyle/Grid 
 
@@ -26,59 +26,52 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
     See the full license in the file "LICENSE" in the top level distribution directory
-    *************************************************************************************/
-    /*  END LEGAL */
+*************************************************************************************/
+/*  END LEGAL */
 #ifndef GRID_LATTICE_UNARY_H
 #define GRID_LATTICE_UNARY_H
 
-namespace Grid {
+NAMESPACE_BEGIN(Grid);
 
-  template<class obj> Lattice<obj> pow(const Lattice<obj> &rhs,RealD y){
-    Lattice<obj> ret(rhs._grid);
-    ret.checkerboard = rhs.checkerboard;
-    conformable(ret,rhs);
-    parallel_for(int ss=0;ss<rhs._grid->oSites();ss++){
-      ret._odata[ss]=pow(rhs._odata[ss],y);
-    }
-    return ret;
+template<class obj> Lattice<obj> pow(const Lattice<obj> &rhs,RealD y){
+  Lattice<obj> ret(rhs._grid);
+  ret.checkerboard = rhs.checkerboard;
+  conformable(ret,rhs);
+  parallel_for(int ss=0;ss<rhs._grid->oSites();ss++){
+    ret._odata[ss]=pow(rhs._odata[ss],y);
   }
-  template<class obj> Lattice<obj> mod(const Lattice<obj> &rhs,Integer y){
-    Lattice<obj> ret(rhs._grid);
-    ret.checkerboard = rhs.checkerboard;
-    conformable(ret,rhs);
-    parallel_for(int ss=0;ss<rhs._grid->oSites();ss++){
-      ret._odata[ss]=mod(rhs._odata[ss],y);
-    }
-    return ret;
-  }
-
-  template<class obj> Lattice<obj> div(const Lattice<obj> &rhs,Integer y){
-    Lattice<obj> ret(rhs._grid);
-    ret.checkerboard = rhs.checkerboard;
-    conformable(ret,rhs);
-    parallel_for(int ss=0;ss<rhs._grid->oSites();ss++){
-      ret._odata[ss]=div(rhs._odata[ss],y);
-    }
-    return ret;
-  }
-
-  template<class obj> Lattice<obj> expMat(const Lattice<obj> &rhs, RealD alpha, Integer Nexp = DEFAULT_MAT_EXP){
-    Lattice<obj> ret(rhs._grid);
-    ret.checkerboard = rhs.checkerboard;
-    conformable(ret,rhs);
-    parallel_for(int ss=0;ss<rhs._grid->oSites();ss++){
-      ret._odata[ss]=Exponentiate(rhs._odata[ss],alpha, Nexp);
-    }
-
-    return ret;
-
-    
-    
-
-    
-  }
-
-
-
+  return ret;
 }
+template<class obj> Lattice<obj> mod(const Lattice<obj> &rhs,Integer y){
+  Lattice<obj> ret(rhs._grid);
+  ret.checkerboard = rhs.checkerboard;
+  conformable(ret,rhs);
+  parallel_for(int ss=0;ss<rhs._grid->oSites();ss++){
+    ret._odata[ss]=mod(rhs._odata[ss],y);
+  }
+  return ret;
+}
+
+template<class obj> Lattice<obj> div(const Lattice<obj> &rhs,Integer y){
+  Lattice<obj> ret(rhs._grid);
+  ret.checkerboard = rhs.checkerboard;
+  conformable(ret,rhs);
+  parallel_for(int ss=0;ss<rhs._grid->oSites();ss++){
+    ret._odata[ss]=div(rhs._odata[ss],y);
+  }
+  return ret;
+}
+
+template<class obj> Lattice<obj> expMat(const Lattice<obj> &rhs, RealD alpha, Integer Nexp = DEFAULT_MAT_EXP){
+  Lattice<obj> ret(rhs._grid);
+  ret.checkerboard = rhs.checkerboard;
+  conformable(ret,rhs);
+  parallel_for(int ss=0;ss<rhs._grid->oSites();ss++){
+    ret._odata[ss]=Exponentiate(rhs._odata[ss],alpha, Nexp);
+  }
+
+  return ret;
+}
+
+NAMESPACE_END(Grid);
 #endif