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

---
 lib/qcd/action/fermion/WilsonKernels.cc     | 5 ++---
 lib/qcd/action/fermion/WilsonKernelsAsm.cc  | 6 ++----
 lib/qcd/action/fermion/WilsonKernelsHand.cc | 5 ++---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/lib/qcd/action/fermion/WilsonKernels.cc b/lib/qcd/action/fermion/WilsonKernels.cc
index dc66db23..e015b765 100644
--- a/lib/qcd/action/fermion/WilsonKernels.cc
+++ b/lib/qcd/action/fermion/WilsonKernels.cc
@@ -30,8 +30,7 @@ directory
 /*  END LEGAL */
 #include <Grid/qcd/action/fermion/FermionCore.h>
 
-namespace Grid {
-namespace QCD {
+NAMESPACE_BEGIN(Grid);
 
 int WilsonKernelsStatic::Opt   = WilsonKernelsStatic::OptGeneric;
 int WilsonKernelsStatic::Comms = WilsonKernelsStatic::CommsAndCompute;
@@ -451,5 +450,5 @@ FermOpTemplateInstantiate(WilsonKernels);
 AdjointFermOpTemplateInstantiate(WilsonKernels);
 TwoIndexFermOpTemplateInstantiate(WilsonKernels);
 
-}}
+NAMESPACE_END(Grid);
 
diff --git a/lib/qcd/action/fermion/WilsonKernelsAsm.cc b/lib/qcd/action/fermion/WilsonKernelsAsm.cc
index cd5d2430..ca14bac3 100644
--- a/lib/qcd/action/fermion/WilsonKernelsAsm.cc
+++ b/lib/qcd/action/fermion/WilsonKernelsAsm.cc
@@ -32,9 +32,7 @@ Author: Guido Cossu <guido.cossu@ed.ac.uk>
 
 #include <Grid/qcd/action/fermion/FermionCore.h>
 
-namespace Grid {
-namespace QCD {
-
+NAMESPACE_BEGIN(Grid);
 
 ///////////////////////////////////////////////////////////
 // Default to no assembler implementation
@@ -123,5 +121,5 @@ INSTANTIATE_ASM(DomainWallVec5dImplDF);
 INSTANTIATE_ASM(ZDomainWallVec5dImplFH);
 INSTANTIATE_ASM(ZDomainWallVec5dImplDF);
 
-}}
+NAMESPACE_END(Grid);
 
diff --git a/lib/qcd/action/fermion/WilsonKernelsHand.cc b/lib/qcd/action/fermion/WilsonKernelsHand.cc
index 80b81714..a4fb07e4 100644
--- a/lib/qcd/action/fermion/WilsonKernelsHand.cc
+++ b/lib/qcd/action/fermion/WilsonKernelsHand.cc
@@ -571,8 +571,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 #define Chimu_31 UChi_11
 #define Chimu_32 UChi_12
 
-namespace Grid {
-namespace QCD {
+NAMESPACE_BEGIN(Grid);
 
 template<class Impl> void 
 WilsonKernels<Impl>::HandDhopSite(StencilImpl &st,LebesgueOrder &lo,DoubledGaugeField &U,SiteHalfSpinor  *buf,
@@ -947,4 +946,4 @@ INSTANTIATE_THEM(DomainWallVec5dImplDF);
 INSTANTIATE_THEM(ZDomainWallVec5dImplFH);
 INSTANTIATE_THEM(ZDomainWallVec5dImplDF);
 
-}}
+NAMESPACE_END(Grid);