renamed min to mymin to avoid possible compiler conflict
authorGengbin Zheng <gzheng@illinois.edu>
Wed, 7 Dec 2005 21:53:28 +0000 (21:53 +0000)
committerGengbin Zheng <gzheng@illinois.edu>
Wed, 7 Dec 2005 21:53:28 +0000 (21:53 +0000)
src/libs/ck-libs/multiphaseSharedArrays/msa-DistPageMgr.h

index 5481e7bef0e3540474858d0c3461cf927a705712..de5c65b188fd15f726229bedee46dcee9dbf68b0 100644 (file)
@@ -27,7 +27,7 @@ template <class ENTRY, class MERGER,
 
 using namespace std;
 
-inline int min(int a, int b)
+inline int mymin(int a, int b)
 {
     return (a<b)?a:b;
 }
@@ -1062,7 +1062,7 @@ public:
         //ckout << "[" << CkMyPe() << "] SyncAckcount = " << syncAckCount << endl;
         // DONE @@ what if fewer worker threads than pe's ?
         // @@ what if fewer worker threads than pe's and >1 threads on 1 pe?
-        if(syncAckCount == min(numberOfWorkerThreads, CkNumPes())){
+        if(syncAckCount == mymin(numberOfWorkerThreads, CkNumPes())){
                                                MSADEBPRINT(printf("SyncAck starting reduction on pageArray of size %d number of pages %d\n",nEntries,nPages););
             pageArray.Sync();                                  
                                }