Hadrons: namespace macro to tackle GCC 5 bug

extras/Hadrons/Global.hpp

@@ -39,8 +39,13 @@ namespace Hadrons {\
 using Grid::operator<<;
 #define END_HADRONS_NAMESPACE }}
 
+#define BEGIN_MODULE_NAMESPACE(name)\
+namespace name {\
+using Grid::operator<<;
+#define END_MODULE_NAMESPACE }
+
 /* the 'using Grid::operator<<;' statement prevents a very nasty compilation
- * error with GCC (clang compiles fine without it).
+ * error with GCC 5 (clang & GCC 6 compile fine without it).
  */
 
 // FIXME: find a way to do that in a more general fashion

extras/Hadrons/Modules/MAction/DWF.hpp

@@ -37,21 +37,21 @@ BEGIN_HADRONS_NAMESPACE
 /******************************************************************************
  *                     Domain wall quark action                               *
  ******************************************************************************/
-namespace MAction
+BEGIN_MODULE_NAMESPACE(MAction)
+
+class DWFPar: Serializable
 {
-    class DWFPar: Serializable
+public:
-    {
-    public:
     GRID_SERIALIZABLE_CLASS_MEMBERS(DWFPar,
                                     std::string, gauge,
                                     unsigned int, Ls,
                                     double      , mass,
                                     double      , M5);
-    };
+};
 
-    class DWF: public Module<DWFPar>
+class DWF: public Module<DWFPar>
-    {
+{
-    public:
+public:
     // constructor
     DWF(const std::string name);
     // destructor
@@ -63,8 +63,9 @@ namespace MAction
     virtual void setup(void);
     // execution
     virtual void execute(void);
-    };
+};
-}
+
+END_MODULE_NAMESPACE
 
 MODULE_REGISTER_NS(DWF, MAction);
 

extras/Hadrons/Modules/MAction/Wilson.hpp

@@ -37,19 +37,19 @@ BEGIN_HADRONS_NAMESPACE
 /******************************************************************************
  *                            Wilson quark action                             *
  ******************************************************************************/
-namespace MAction
+BEGIN_MODULE_NAMESPACE(MAction)
+
+class WilsonPar: Serializable
 {
-    class WilsonPar: Serializable
+public:
-    {
-    public:
     GRID_SERIALIZABLE_CLASS_MEMBERS(WilsonPar,
                                     std::string, gauge,
                                     double     , mass);
-    };
+};
 
-    class Wilson: public Module<WilsonPar>
+class Wilson: public Module<WilsonPar>
-    {
+{
-    public:
+public:
     // constructor
     Wilson(const std::string name);
     // destructor
@@ -61,8 +61,9 @@ namespace MAction
     virtual void setup(void);
     // execution
     virtual void execute(void);
-    };
+};
-}
+
+END_MODULE_NAMESPACE
 
 MODULE_REGISTER_NS(Wilson, MAction);
 

extras/Hadrons/Modules/MContraction/Meson.hpp

@@ -37,27 +37,27 @@ BEGIN_HADRONS_NAMESPACE
 /******************************************************************************
  *                                Meson                                       *
  ******************************************************************************/
-namespace MContraction
+BEGIN_MODULE_NAMESPACE(MContraction)
+
+class MesonPar: Serializable
 {
-    class MesonPar: Serializable
+public:
-    {
-    public:
     GRID_SERIALIZABLE_CLASS_MEMBERS(MesonPar,
                                     std::string, q1,
                                     std::string, q2,
                                     std::string, output);
-    };
+};
 
-    class Meson: public Module<MesonPar>
+class Meson: public Module<MesonPar>
-    {
+{
-    public:
+public:
     class Result: Serializable
     {
     public:
         GRID_SERIALIZABLE_CLASS_MEMBERS(Result,
                                         std::vector<std::vector<std::vector<Complex>>>, corr);
     };
-    public:
+public:
     // constructor
     Meson(const std::string name);
     // destructor
@@ -67,8 +67,9 @@ namespace MContraction
     virtual std::vector<std::string> getOutput(void);
     // execution
     virtual void execute(void);
-    };
+};
-}
+
+END_MODULE_NAMESPACE
 
 MODULE_REGISTER_NS(Meson, MContraction);
 

extras/Hadrons/Modules/MGauge/Load.hpp

@@ -37,18 +37,18 @@ BEGIN_HADRONS_NAMESPACE
 /******************************************************************************
  *                         Load a NERSC configuration                         *
  ******************************************************************************/
-namespace MGauge
+BEGIN_MODULE_NAMESPACE(MGauge)
+
+class LoadPar: Serializable
 {
-    class LoadPar: Serializable
+public:
-    {
-    public:
     GRID_SERIALIZABLE_CLASS_MEMBERS(LoadPar,
                                     std::string, file);
-    };
+};
 
-    class Load: public Module<LoadPar>
+class Load: public Module<LoadPar>
-    {
+{
-    public:
+public:
     // constructor
     Load(const std::string name);
     // destructor
@@ -60,8 +60,9 @@ namespace MGauge
     virtual void setup(void);
     // execution
     virtual void execute(void);
-    };
+};
-}
+
+END_MODULE_NAMESPACE
 
 MODULE_REGISTER_NS(Load, MGauge);
 

extras/Hadrons/Modules/MGauge/Random.hpp

@@ -37,11 +37,11 @@ BEGIN_HADRONS_NAMESPACE
 /******************************************************************************
  *                             Random gauge                                   *
  ******************************************************************************/
-namespace MGauge
+BEGIN_MODULE_NAMESPACE(MGauge)
+
+class Random: public Module<NoPar>
 {
-    class Random: public Module<NoPar>
+public:
-    {
-    public:
     // constructor
     Random(const std::string name);
     // destructor
@@ -53,8 +53,9 @@ namespace MGauge
     virtual void setup(void);
     // execution
     virtual void execute(void);
-    };
+};
-}
+
+END_MODULE_NAMESPACE
 
 MODULE_REGISTER_NS(Random, MGauge);
 

extras/Hadrons/Modules/MGauge/Unit.hpp

@@ -37,11 +37,11 @@ BEGIN_HADRONS_NAMESPACE
 /******************************************************************************
  *                              Unit gauge                                    *
  ******************************************************************************/
-namespace MGauge
+BEGIN_MODULE_NAMESPACE(MGauge)
+
+class Unit: public Module<NoPar>
 {
-    class Unit: public Module<NoPar>
+public:
-    {
-    public:
     // constructor
     Unit(const std::string name);
     // destructor
@@ -53,8 +53,9 @@ namespace MGauge
     virtual void setup(void);
     // execution
     virtual void execute(void);
-    };
+};
-}
+
+END_MODULE_NAMESPACE
 
 MODULE_REGISTER_NS(Unit, MGauge);
 

extras/Hadrons/Modules/MSolver/RBPrecCG.hpp

@@ -37,19 +37,19 @@ BEGIN_HADRONS_NAMESPACE
 /******************************************************************************
  *                     Schur red-black preconditioned CG                      *
  ******************************************************************************/
-namespace MSolver
+BEGIN_MODULE_NAMESPACE(MSolver)
+
+class RBPrecCGPar: Serializable
 {
-    class RBPrecCGPar: Serializable
+public:
-    {
-    public:
     GRID_SERIALIZABLE_CLASS_MEMBERS(RBPrecCGPar,
                                     std::string, action,
                                     double     , residual);
-    };
+};
 
-    class RBPrecCG: public Module<RBPrecCGPar>
+class RBPrecCG: public Module<RBPrecCGPar>
-    {
+{
-    public:
+public:
     // constructor
     RBPrecCG(const std::string name);
     // destructor
@@ -61,8 +61,9 @@ namespace MSolver
     virtual void setup(void);
     // execution
     virtual void execute(void);
-    };
+};
-}
+
+END_MODULE_NAMESPACE
 
 MODULE_REGISTER_NS(RBPrecCG, MSolver);
 

extras/Hadrons/Modules/MSource/Point.hpp

@@ -48,18 +48,18 @@ BEGIN_HADRONS_NAMESPACE
 /******************************************************************************
  *                                  Point                                     *
  ******************************************************************************/
-namespace MSource
+BEGIN_MODULE_NAMESPACE(MSource)
+
+class PointPar: Serializable
 {
-    class PointPar: Serializable
+public:
-    {
-    public:
     GRID_SERIALIZABLE_CLASS_MEMBERS(PointPar,
                                     std::string, position);
-    };
+};
 
-    class Point: public Module<PointPar>
+class Point: public Module<PointPar>
-    {
+{
-    public:
+public:
     // constructor
     Point(const std::string name);
     // destructor
@@ -71,8 +71,9 @@ namespace MSource
     virtual void setup(void);
     // execution
     virtual void execute(void);
-    };
+};
-}
+
+END_MODULE_NAMESPACE
 
 MODULE_REGISTER_NS(Point, MSource);
 

extras/Hadrons/Modules/MSource/Z2.hpp

@@ -49,19 +49,19 @@ BEGIN_HADRONS_NAMESPACE
 /******************************************************************************
  *                                 Z2                                         *
  ******************************************************************************/
-namespace MSource
+BEGIN_MODULE_NAMESPACE(MSource)
+
+class Z2Par: Serializable
 {
-    class Z2Par: Serializable
+public:
-    {
-    public:
     GRID_SERIALIZABLE_CLASS_MEMBERS(Z2Par,
                                     unsigned int, tA,
                                     unsigned int, tB);
-    };
+};
 
-    class Z2: public Module<Z2Par>
+class Z2: public Module<Z2Par>
-    {
+{
-    public:
+public:
     // constructor
     Z2(const std::string name);
     // destructor
@@ -73,8 +73,9 @@ namespace MSource
     virtual void setup(void);
     // execution
     virtual void execute(void);
-    };
+};
-}
+
+END_MODULE_NAMESPACE
 
 MODULE_REGISTER_NS(Z2, MSource);
 

extras/Hadrons/Modules/templates/Module_in_NS.hpp.template

@@ -10,18 +10,18 @@ BEGIN_HADRONS_NAMESPACE
 /******************************************************************************
  *                         ___FILEBASENAME___                                 *
  ******************************************************************************/
-namespace ___NAMESPACE___
+BEGIN_MODULE_NAMESPACE(___NAMESPACE___)
+
+class ___FILEBASENAME___Par: Serializable
 {
-    class ___FILEBASENAME___Par: Serializable
+public:
-    {
-    public:
     GRID_SERIALIZABLE_CLASS_MEMBERS(___FILEBASENAME___Par,
                                     unsigned int, i);
-    };
+};
 
-    class ___FILEBASENAME___: public Module<___FILEBASENAME___Par>
+class ___FILEBASENAME___: public Module<___FILEBASENAME___Par>
-    {
+{
-    public:
+public:
     // constructor
     ___FILEBASENAME___(const std::string name);
     // destructor
@@ -33,8 +33,9 @@ namespace ___NAMESPACE___
     virtual void setup(void);
     // execution
     virtual void execute(void);
-    };
+};
-}
+
+END_MODULE_NAMESPACE
 
 MODULE_REGISTER_NS(___FILEBASENAME___, ___NAMESPACE___);