[SMPI] Reverted removal of 'extern C' as this broke things.

diff --git a/src/smpi/private.hpp b/src/smpi/private.hpp
index 5323374..a384ac7 100644 (file)
--- a/src/smpi/private.hpp
+++ b/src/smpi/private.hpp
@@ -19,6 +19,8 @@ XBT_PRIVATE int smpi_process_event_set(void);
 extern std::unordered_map<std::string, double> location2speedup;
 
 /** @brief Returns the last call location (filename, linenumber). Process-specific. */
 extern std::unordered_map<std::string, double> location2speedup;
 
 /** @brief Returns the last call location (filename, linenumber). Process-specific. */

+extern "C" {

 XBT_PUBLIC(smpi_trace_call_location_t*) smpi_process_get_call_location(void);
 XBT_PUBLIC(smpi_trace_call_location_t*) smpi_trace_get_call_location();
 XBT_PUBLIC(smpi_trace_call_location_t*) smpi_process_get_call_location(void);
 XBT_PUBLIC(smpi_trace_call_location_t*) smpi_trace_get_call_location();

+}

 #endif
 #endif

diff --git a/src/smpi/smpi_bench.cpp b/src/smpi/smpi_bench.cpp
index 31dce5b..de5c96e 100644 (file)
--- a/src/smpi/smpi_bench.cpp
+++ b/src/smpi/smpi_bench.cpp
@@ -738,11 +738,11 @@ void smpi_destroy_global_memory_segments(){
 #endif
 }
 
 #endif
 }
 

-smpi_trace_call_location_t* smpi_trace_get_call_location() {
-  return smpi_process_get_call_location();
-}
-

 extern "C" { /** These functions will be called from the user code **/
 extern "C" { /** These functions will be called from the user code **/

+  smpi_trace_call_location_t* smpi_trace_get_call_location() {
+    return smpi_process_get_call_location();
+  }
+

   void smpi_trace_set_call_location(const char* file, const int line) {
     smpi_trace_call_location_t* loc = smpi_process_get_call_location();
 
   void smpi_trace_set_call_location(const char* file, const int line) {
     smpi_trace_call_location_t* loc = smpi_process_get_call_location();