[cgma-dev] r3267 - cgm/trunk/geom/parallel

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2009-11-03 09:02:44 -0600 (Tue, 03 Nov 2009)
New Revision: 3267

Modified:
   cgm/trunk/geom/parallel/CGMParallelComm.cpp
   cgm/trunk/geom/parallel/CGMProcConfig.hpp
Log:
2nd and 3rd patches from Jed Brown to fix portability issues

Modified: cgm/trunk/geom/parallel/CGMParallelComm.cpp
===================================================================
--- cgm/trunk/geom/parallel/CGMParallelComm.cpp	2009-11-03 14:59:58 UTC (rev 3266)
+++ cgm/trunk/geom/parallel/CGMParallelComm.cpp	2009-11-03 15:02:44 UTC (rev 3267)
@@ -7,6 +7,7 @@
 
 //#include <iostream>
 #include <sstream>
+#include <algoritm>
 
 #ifdef USE_MPI
 #include "CGMmpi.h"

Modified: cgm/trunk/geom/parallel/CGMProcConfig.hpp
===================================================================
--- cgm/trunk/geom/parallel/CGMProcConfig.hpp	2009-11-03 14:59:58 UTC (rev 3266)
+++ cgm/trunk/geom/parallel/CGMProcConfig.hpp	2009-11-03 15:02:44 UTC (rev 3267)
@@ -8,36 +8,7 @@
 
 
 #ifdef USE_MPI
-/* MPICH2 will fail if SEEK_* macros are defined
- * because they are also C++ enums. Undefine them
- * when including mpi.h and then redefine them
- * for sanity.
- */
-
-#  ifdef SEEK_SET
-#    define CGM_SEEK_SET SEEK_SET
-#    define CGM_SEEK_CUR SEEK_CUR
-#    define CGM_SEEK_END SEEK_END
-#    undef SEEK_SET
-#    undef SEEK_CUR
-#    undef SEEK_END
-#  endif
-#include "mpi.h"
-
-#  ifdef CGM_SEEK_SET
-#    define SEEK_SET CGM_SEEK_SET
-#    define SEEK_CUR CGM_SEEK_CUR
-#    define SEEK_END CGM_SEEK_END
-#    undef CGM_SEEK_SET
-#    undef CGM_SEEK_CUR
-#    undef CGM_SEEK_END
-#  endif
-//extern "C" 
-//{
-  //#include "types.h"
-  //#include "errmem.h"
-//#include "crystal.h"
-//}
+#  include "CGMmpi.h"
 #else
 typedef int MPI_Comm;
 #define MPI_COMM_WORLD 0