From 493ea802089fc66fe2152666560de13bb0ea2d7e Mon Sep 17 00:00:00 2001 From: paboyle Date: Sun, 14 Jan 2018 23:29:53 +0000 Subject: [PATCH] Namespace --- .../action/fermion/ImprovedStaggeredFermion.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/qcd/action/fermion/ImprovedStaggeredFermion.h b/lib/qcd/action/fermion/ImprovedStaggeredFermion.h index 9d5270c6..ebc36a8b 100644 --- a/lib/qcd/action/fermion/ImprovedStaggeredFermion.h +++ b/lib/qcd/action/fermion/ImprovedStaggeredFermion.h @@ -25,16 +25,14 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ -/* END LEGAL */ + /* END LEGAL */ #ifndef GRID_QCD_IMPR_STAG_FERMION_H #define GRID_QCD_IMPR_STAG_FERMION_H -namespace Grid { - -namespace QCD { +NAMESPACE_BEGIN(Grid); class ImprovedStaggeredFermionStatic { - public: +public: static const std::vector directions; static const std::vector displacements; static const int npoint = 16; @@ -42,7 +40,7 @@ class ImprovedStaggeredFermionStatic { template class ImprovedStaggeredFermion : public StaggeredKernels, public ImprovedStaggeredFermionStatic { - public: +public: INHERIT_IMPL_TYPES(Impl); typedef StaggeredKernels Kernels; @@ -130,7 +128,7 @@ class ImprovedStaggeredFermion : public StaggeredKernels, public ImprovedS /////////////////////////////////////////////////////////////// // protected: - public: +public: // any other parameters of action ??? RealD mass; @@ -178,6 +176,6 @@ class ImprovedStaggeredFermion : public StaggeredKernels, public ImprovedS typedef ImprovedStaggeredFermion ImprovedStaggeredFermionF; typedef ImprovedStaggeredFermion ImprovedStaggeredFermionD; -} -} +NAMESPACE_END(Grid); + #endif