Namespace QCD gone

lib/qcd/action/scalar/ScalarInteractionAction.h

@@ -30,12 +30,10 @@ directory
 #ifndef SCALAR_INT_ACTION_H
 #define SCALAR_INT_ACTION_H
 
-
 // Note: this action can completely absorb the ScalarAction for real float fields
 // use the scalarObjs to generalise the structure
 
-namespace Grid {
-  // FIXME drop the QCD namespace everywhere here
+NAMESPACE_BEGIN(Grid);
 
 template <class Impl, int Ndim >
 class ScalarInteractionAction : public QCD::Action<typename Impl::Field> {
@@ -143,6 +141,6 @@ namespace Grid {
   }
 };
   
-}  // namespace Grid
+NAMESPACE_END(Grid);
 
 #endif  // SCALAR_INT_ACTION_H