Revert "always define ConverDeliver() function in case it is needed (for example...
authorGengbin Zheng <gzheng@illinois.edu>
Tue, 6 Apr 2010 04:10:27 +0000 (23:10 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Tue, 6 Apr 2010 04:10:27 +0000 (23:10 -0500)
This reverts commit 736919f969853865e782513d01ec4d196245c94c.

src/ck-core/debug-charm.C
tests/charm++/simplearrayhello/hello.C

index ee31def9499813bb1e295327fc9de546c662f9c7..07d5cd5dbf517c46f890a293c0cd4b1ae0afbddb 100644 (file)
 /** Specify if we are replaying the processor from message logs, thus disable delivering of messages */
 int _replaySystem = 0;
 
-#undef ConverseDeliver
+#if CMK_REPLAYSYSTEM
+
 int ConverseDeliver() {
   return !_replaySystem;
 }
+#endif
 
 #if CMK_CCS_AVAILABLE && !defined(_WIN32)
 
index 500953c7ee2c99e2a65ecbf3e1333c267abef216..f11727a4a6f677e89e1e6b3169f99584af6f96d8 100644 (file)
@@ -45,7 +45,7 @@ public:
   
   void SayHi(int hiNo)
   {
-    CkPrintf("Hi[%d] from element %d %d\n",hiNo,thisIndex,nElements);
+    CkPrintf("Hi[%d] from element %d\n",hiNo,thisIndex);
     if (thisIndex < nElements-1)
       //Pass the hello on:
       thisProxy[thisIndex+1].SayHi(hiNo+1);