Removed a condition for the FT versions. Now, all of them are free to use any chare...
authorEsteban Meneses <emenese2@illinois.edu>
Tue, 18 Aug 2009 15:56:58 +0000 (15:56 +0000)
committerEsteban Meneses <emenese2@illinois.edu>
Tue, 18 Aug 2009 15:56:58 +0000 (15:56 +0000)
src/ck-core/cklocation.C

index 2dae1568792e3274e3b88843609e21c6b2b6c848..315ffeeac83d4975b7c25f98116e5bad43c0a581 100644 (file)
@@ -719,15 +719,12 @@ public:
 class CkMapsInit : public Chare
 {
 public:
-  CkMapsInit(CkArgMsg *msg) {
-#ifdef __FAULT__
-    _defaultArrayMapID = CProxy_RRMap::ckNew();
-#else
-    _defaultArrayMapID = CProxy_DefaultArrayMap::ckNew();
-#endif
-    delete msg;
-  }
-  CkMapsInit(CkMigrateMessage *m) {}
+       CkMapsInit(CkArgMsg *msg) {
+               _defaultArrayMapID = CProxy_DefaultArrayMap::ckNew();
+               delete msg;
+       }
+
+       CkMapsInit(CkMigrateMessage *m) {}
 };
 
 // given an envelope of a Charm msg, find the recipient object pointer
@@ -1732,6 +1729,7 @@ CkLocMgr::CkLocMgr(CkMigrateMessage* m)
 void CkLocMgr::pup(PUP::er &p){
        IrrGroup::pup(p);
        p|mapID;
+       p|mapHandle;
        p|lbdbID;
        mapID = _defaultArrayMapID;
        if(p.isUnpacking()){
@@ -1742,7 +1740,7 @@ void CkLocMgr::pup(PUP::er &p){
                map=(CkArrayMap *)CkLocalBranch(mapID);
                if (map==NULL) CkAbort("ERROR!  Local branch of array map is NULL!");
                 CkArrayIndexMax emptyIndex;
-               mapHandle=map->registerArray(emptyIndex,thisgroup);
+               map->registerArray(emptyIndex,thisgroup);
                // _lbdb is the fixed global groupID
                initLB(lbdbID);