Revert "Drop requirement for user code to call CBase_foo::pup(p)"
[charm.git] / src / ck-core / cklocation.C
index a49aefdf145b9fa3acd91b71316851d430065a62..f026c0f52cdd158dd1ff7d59af989b64e9dbf46f 100644 (file)
@@ -901,7 +901,6 @@ void CkArrayPrefetch_writeToSwap(FILE *swapfile,void *objptr) {
 
   //Save the element's data to disk:
   PUP::toDisk p(swapfile);
-  elt->base_pup(p);
   elt->pup(p);
 
   //Call the element's destructor in-place (so pointer doesn't change)
@@ -924,7 +923,6 @@ void CkArrayPrefetch_readFromSwap(FILE *swapfile,void *objptr) {
   
   //Restore the element's data from disk:
   PUP::fromDisk p(swapfile);
-  elt->base_pup(p);
   elt->pup(p);
 }
 
@@ -2101,9 +2099,7 @@ CmiBool CkLocMgr::addElementToRec(CkLocRec_local *rec,ManagerRec *m,
 
 #if CMK_OUT_OF_CORE
        /* Register new element with out-of-core */
-       PUP::sizer p_getSize;
-        elt->base_pup(p_getSize);
-        elt->pup(p_getSize);
+       PUP::sizer p_getSize; elt->pup(p_getSize);
        elt->prefetchObjID=CooRegisterObject(&CkArrayElementPrefetcher,p_getSize.size(),elt);
 #endif
        
@@ -2517,7 +2513,6 @@ void CkLocMgr::pupElementsFor(PUP::er &p,CkLocRec_local *rec,
                CkMigratable *elt=m->element(localIdx);
                if (elt!=NULL)
                 {
-                        elt->base_pup(p);
                         elt->pup(p);
 #if CMK_ERROR_CHECKING
                         if (p.isUnpacking()) elt->sanitycheck();