eman2/namespace.patch

   1 Index: src/EMAN2/src/eman2/libEM/marchingcubes.cpp
   2 ===================================================================
   3 --- src.orig/EMAN2/src/eman2/libEM/marchingcubes.cpp
   4 +++ src/EMAN2/src/eman2/libEM/marchingcubes.cpp
   5 @@ -50,6 +50,7 @@ using namespace EMAN;
   6  #define min(a,b)(((a) < (b)) ? (a) : (b))
   7  #define max(a,b)(((a) > (b)) ? (a) : (b))
   8
   9 +namespace EMAN {
  10  //a2fVertexOffset lists the positions, relative to vertex0, of each of the 8 vertices of a cube
  11  static const int a2fVertexOffset[8][3] =
  12  {
  13 @@ -1159,3 +1160,4 @@ BOOST_PYTHON_MODULE(gorgon)
  14      ;
  15  }
  16  */
  17 +}
  18 Index: src/EMAN2/src/eman2/libEM/sparx/util_sparx.cpp
  19 ===================================================================
  20 --- src.orig/EMAN2/src/eman2/libEM/sparx/util_sparx.cpp
  21 +++ src/EMAN2/src/eman2/libEM/sparx/util_sparx.cpp
  22 @@ -59,6 +59,8 @@ using namespace EMAN;
  23  using namespace std;
  24  using std::complex;
  25
  26 +namespace EMAN {
  27 +
  28  vector<float> Util::infomask(EMData* Vol, EMData* mask, bool flip = false)
  29  //  flip true:  find statistics under the mask (mask >0.5)
  30  //  flip false: find statistics ourside the mask (mask <0.5)
  31 @@ -21578,3 +21580,5 @@ int Util::branch_factor_4(int* costlist,
  32
  33
  34  }
  35 +
  36 +}