stringify

[simgrid.git] / src / instr / instr_smpi.hpp

diff --git a/src/instr/instr_smpi.hpp b/src/instr/instr_smpi.hpp
index 9b01f6f..146d6b7 100644 (file)
--- a/src/instr/instr_smpi.hpp
+++ b/src/instr/instr_smpi.hpp
@@ -10,6 +10,8 @@
 #include "src/instr/instr_private.hpp"
 #include <string>
 
+XBT_PRIVATE std::string smpi_container(int rank);
+
 extern "C" {
 
 XBT_PRIVATE void TRACE_internal_smpi_set_category(const char* category);
@@ -32,24 +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;
 
   std::string get_composed_key()
   {
-    return std::string(previous_filename) + ':' + std::to_string(previous_linenumber) + ':' + filename + ':' +
+    return previous_filename + ':' + std::to_string(previous_linenumber) + ':' + filename + ':' +
            std::to_string(linenumber);
   }
-
-} smpi_trace_call_location_t;
+};
 }
 
 #endif