From 69d578478a6c5caf92cc0e7ec14b02d0fa95daf2 Mon Sep 17 00:00:00 2001
From: Peter Boyle <paboyle@ph.ed.ac.uk>
Date: Fri, 10 Apr 2015 05:53:09 +0200
Subject: [PATCH] Fixing the comms=none compile

---
 Grid_Lattice.h     | 3 ++-
 Grid_cshift_none.h | 1 +
 Grid_main.cc       | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Grid_Lattice.h b/Grid_Lattice.h
index 01b95755..119d6181 100644
--- a/Grid_Lattice.h
+++ b/Grid_Lattice.h
@@ -15,9 +15,10 @@ public:
     GridBase *_grid;
     int checkerboard;
     std::vector<vobj,alignedAllocator<vobj> > _odata;
+public:
+
     typedef typename vobj::scalar_type scalar_type;
     typedef typename vobj::vector_type vector_type;
-public:
 
     Lattice(GridBase *grid) : _grid(grid) {
         _odata.reserve(_grid->oSites());
diff --git a/Grid_cshift_none.h b/Grid_cshift_none.h
index 37d20fa3..402e52b4 100644
--- a/Grid_cshift_none.h
+++ b/Grid_cshift_none.h
@@ -6,6 +6,7 @@ friend Lattice<vobj> Cshift(Lattice<vobj> &rhs,int dimension,int shift)
   Lattice<vobj> ret(rhs._grid);
   ret.checkerboard = rhs._grid->CheckerBoardDestination(rhs.checkerboard,shift);
   Cshift_local(ret,rhs,dimension,shift);
+  return ret;
 }
         
 #endif
diff --git a/Grid_main.cc b/Grid_main.cc
index 770de9a3..c51aff6d 100644
--- a/Grid_main.cc
+++ b/Grid_main.cc
@@ -195,6 +195,7 @@ int main (int argc, char ** argv)
       LatticeCoordinate(coor,d);
       lex = lex + coor*mm[d];
     }
+    /*
     Bar = zero;
     Bar = where(lex<10,Foo,Bar);
     {
@@ -210,7 +211,8 @@ int main (int argc, char ** argv)
 	  cout<<"bar "<<coor[0]<<coor[1]<<coor[2]<<coor[3] <<" "<<bar._internal._internal[r][c]<<std::endl;
 	}}
       }}}}
-    }    
+    } 
+    */   
     //setCheckerboard(ShiftedCheck,rFoo); 
     //setCheckerboard(ShiftedCheck,bFoo);