From: Christian Heinrich <franz-christian.heinrich@inria.fr>
Date: Fri, 27 May 2016 14:30:31 +0000 (+0200)
Subject: [SMPI] Reverted removal of 'extern C' as this broke things.
X-Git-Tag: v3_14~1132^2~1
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1f7474b9bb0f7838d0fc775e65608933f82724ca?ds=inline

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

diff --git a/src/smpi/private.hpp b/src/smpi/private.hpp
index 53233742e8..a384ac7468 100644
--- 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 "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();
+}
 #endif
diff --git a/src/smpi/smpi_bench.cpp b/src/smpi/smpi_bench.cpp
index 31dce5b38f..de5c96e275 100644
--- a/src/smpi/smpi_bench.cpp
+++ b/src/smpi/smpi_bench.cpp
@@ -738,11 +738,11 @@ void smpi_destroy_global_memory_segments(){
 #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 **/
+  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();