Fixed problem with bigsim environment not picking up the right CkReduce function
authorFilippo Gioachin <gioachin@uiuc.edu>
Sat, 3 Jul 2010 01:38:24 +0000 (20:38 -0500)
committerFilippo Gioachin <gioachin@uiuc.edu>
Sat, 3 Jul 2010 01:38:24 +0000 (20:38 -0500)
src/ck-core/middle-blue.h
src/ck-core/middle.h

index 120626d2cb192dbc7074cf984faee64a398ce1ba..d6e158de570b7e721712373326b2e46bc01c3fb3 100644 (file)
@@ -154,6 +154,9 @@ static inline void CksdScheduler(int ret) { BgScheduler(ret); }
 static inline void CksdExitScheduler() { BgExitScheduler(); }
 static inline void CkDeliverMsgs(int nmsg)     { BgDeliverMsgs(nmsg); }
 
+#ifdef __cplusplus
+extern "C"
+#endif
 void CkReduce(void *msg, int size, CmiReduceMergeFn mergeFn);
 
 }  /* end of namespace */
index 41ce168af010a7ec102ab6328b05e6c822abfc09..79ab7a9af267fd72d6821f8f0378f5014de0a194 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef _MIDDLE_H_
 #define _MIDDLE_H_
 
+#include "charm.h"  /* If we don't make sure this is included, we may miss CMK_BLUEGENE_CHARM */
+
 #if CMK_NAMESPACES_BROKEN
 # if CMK_BLUEGENE_CHARM
 #  error "BLUEGENE Charm++ cannot be compiled without namespace support"