X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f734ec7475682eb90323e804cbcfddd7e4523992..00c310601ea73e6114aae19f8abfba765d6d5788:/src/instr/instr_smpi.hpp

diff --git a/src/instr/instr_smpi.hpp b/src/instr/instr_smpi.hpp
index e212b46e81..146d6b7ab6 100644
--- a/src/instr/instr_smpi.hpp
+++ b/src/instr/instr_smpi.hpp
@@ -6,14 +6,13 @@
 #ifndef INSTR_SMPI_HPP
 #define INSTR_SMPI_HPP
 
-#ifdef __cplusplus
-#include <string>
-#endif
-
 #include "smpi/smpi.h"
 #include "src/instr/instr_private.hpp"
+#include <string>
 
-SG_BEGIN_DECL()
+XBT_PRIVATE std::string smpi_container(int rank);
+
+extern "C" {
 
 XBT_PRIVATE void TRACE_internal_smpi_set_category(const char* category);
 XBT_PRIVATE const char* TRACE_internal_smpi_get_category();
@@ -35,25 +34,23 @@ XBT_PRIVATE void TRACE_smpi_send(int rank, int src, int dst, int tag, int size);
 XBT_PRIVATE void TRACE_smpi_recv(int src, int dst, int tag);
 XBT_PRIVATE void TRACE_smpi_init(int rank);
 XBT_PRIVATE void TRACE_smpi_finalize(int rank);
-XBT_PRIVATE char* smpi_container(int rank, char* container, int n);
 
 XBT_PRIVATE const char* encode_datatype(MPI_Datatype datatype, int* known);
 
-typedef struct smpi_trace_call_location {
-  const char* filename;
+class smpi_trace_call_location_t {
+public:
+  std::string filename;
   int linenumber;
 
-  const char* previous_filename;
+  std::string previous_filename;
   int previous_linenumber;
 
-#ifdef __cplusplus
-  std::string get_composed_key() {
-    return std::string(previous_filename) + ':' + std::to_string(previous_linenumber) + ':' + filename + ':' + std::to_string(linenumber);
+  std::string get_composed_key()
+  {
+    return previous_filename + ':' + std::to_string(previous_linenumber) + ':' + filename + ':' +
+           std::to_string(linenumber);
   }
-#endif
-
-} smpi_trace_call_location_t;
-
-SG_END_DECL()
+};
+}
 
 #endif