Merge branch 'charm' of charmgit:charm into charm
[charm.git] / src / ck-com / RectMulticastStrategy.C
index 0b06a91ae611e8d91c72e1ca8f84177a8ed080db..33656ef6c70da69607ccd4fab1aecf96119a2bc2 100644 (file)
@@ -271,7 +271,7 @@ void RectMulticastStrategy::insertSectionID(CkSectionID *sid) {
 
 
 ComlibRectSectionHashObject *
-RectMulticastStrategy::createObjectOnSrcPe(int nindices, CkArrayIndexMax *idxlist, unsigned int thisSectionID) {
+RectMulticastStrategy::createObjectOnSrcPe(int nindices, CkArrayIndex *idxlist, unsigned int thisSectionID) {
 
     ComlibPrintf("[%d] createObjectOnSrcPe \n", CkMyPe());   
     ComlibPrintf("[%d] Rect createObjectOnSrcPe \n", CkMyPe());   
@@ -488,7 +488,7 @@ BGTsRC_Geometry_t *RectMulticastStrategy::getRectGeometry(ComlibRectSectionHashO
 
 ComlibRectSectionHashObject *
 RectMulticastStrategy::createObjectOnIntermediatePe(int nindices,
-                                                     CkArrayIndexMax *idxlist,
+                                                     CkArrayIndex *idxlist,
                                                      int npes,
                                                      ComlibMulticastIndexCount *counts,
                                                      int srcpe, int thisSectionID) {
@@ -677,7 +677,7 @@ void RectMulticastStrategy::beginProcessing(int numElements){
     bgl_machine_RectBcastConfigure (rectRequest);
     CkArrayID dest;
     int nidx;
-    CkArrayIndexMax *idx_list;
+    CkArrayIndex *idx_list;
 
     ainfo.getDestinationArray(dest, idx_list, nidx);
     sinfo = ComlibSectionInfo(dest, myInstanceID);
@@ -756,7 +756,7 @@ void RectMulticastStrategy::handleNewMulticastMessage(envelope *env) {
     int sender=env->getSrcPe();
     int localElems;
     envelope *newenv;
-    CkArrayIndexMax *local_idx_list;    
+    CkArrayIndex *local_idx_list;    
     
     sinfo.unpack(env, localElems, local_idx_list, newenv);
 
@@ -773,7 +773,7 @@ void RectMulticastStrategy::handleNewMulticastMessage(envelope *env) {
     }
 
     /*
-    CkArrayIndexMax *idx_list_array = new CkArrayIndexMax[idx_list.size()];
+    CkArrayIndex *idx_list_array = new CkArrayIndex[idx_list.size()];
     for(int count = 0; count < idx_list.size(); count++)
         idx_list_array[count] = idx_list[count];
     */