ckmulticast: Fix recent checkin with default args gone awry
authorRamprasad Venkataraman <ramv@illinois.edu>
Fri, 4 Nov 2011 01:54:54 +0000 (20:54 -0500)
committerRamprasad Venkataraman <ramv@illinois.edu>
Fri, 4 Nov 2011 01:54:54 +0000 (20:54 -0500)
src/libs/ck-libs/multicast/ckmulticast.ci
src/libs/ck-libs/multicast/ckmulticast.h

index 96e2c121de643b83a1971764c1e2857ab7a8e857..3827129d78e133a9b3a33d1a6db77dd46f9c8c49 100644 (file)
@@ -11,9 +11,7 @@ module CkMulticast {
 //  };
   
   group [migratable] CkMulticastMgr {
-    entry CkMulticastMgr();
-    entry CkMulticastMgr(unsigned int, unsigned int);
-    entry CkMulticastMgr(int factor, unsigned int, unsigned int);
+    entry CkMulticastMgr(int _factor = 2, unsigned int _split_size = 32768, unsigned int _split_threshold = 32768);
     // set up
     entry void setup(multicastSetupMsg *);
     entry void recvCookie(CkSectionInfo sid, CkSectionInfo child);
index 559a6fe4843017ce960a947d96a47d55245107a9..7e7fadc8e7fed238a549b4364ce3594d0edf3860 100644 (file)
@@ -50,9 +50,11 @@ class CkMulticastMgr: public CkDelegateMgr
         
     public:
         // ------------------------- Cons/Des-tructors ------------------------
-        CkMulticastMgr(unsigned int _split_size = 32768, unsigned int _split_threshold = 32768)  { factor = MAXMCASTCHILDREN; split_size = _split_size; split_threshold = _split_threshold;}
         CkMulticastMgr(CkMigrateMessage *m)  {}
-        CkMulticastMgr(int f, unsigned int _split_size = 32768, unsigned int _split_threshold = 32768)  { factor = f; split_size = _split_size; split_threshold = _split_threshold;}
+        CkMulticastMgr(int _factor = 2, unsigned int _split_size = 32768, unsigned int _split_threshold = 32768):
+            factor(_factor),
+            split_size(_split_size),
+            split_threshold(_split_threshold) {}
         int useDefCtor(void){ return 1; }
         void pup(PUP::er &p){ 
                CkDelegateMgr::pup(p);