From 9ad3b281f6e187eeb20c48f88820a1c0091bcf8f Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 22 Sep 2017 01:08:47 +0200
Subject: [PATCH] instr: prefer std::str to char*

---
 src/instr/instr_paje_trace.cpp | 11 +++--------
 src/instr/instr_private.h      |  5 ++---
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index d65b5b4b49..3e7c28234a 100644
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -763,11 +763,6 @@ void simgrid::instr::ResetStateEvent::print()
   }
 }
 
-simgrid::instr::StartLinkEvent::~StartLinkEvent()
-{
-  free(value_);
-  free(key_);
-}
 simgrid::instr::StartLinkEvent::StartLinkEvent(double timestamp, container_t container, Type* type,
                                                container_t sourceContainer, const char* value, const char* key)
     : StartLinkEvent(timestamp, container, type, sourceContainer, value, key, -1)
@@ -779,14 +774,14 @@ simgrid::instr::StartLinkEvent::StartLinkEvent(double timestamp, container_t con
     : container_(container)
     , type_(type)
     , sourceContainer_(sourceContainer)
-    , value_(xbt_strdup(value))
-    , key_(xbt_strdup(key))
+    , value_(value)
+    , key_(key)
     , size_(size)
 {
   eventType_            = PAJE_StartLink;
   this->timestamp_      = timestamp;
 
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f, value:%s", __FUNCTION__, (int)eventType_, this->timestamp_, this->value_);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f, value:%s", __FUNCTION__, (int)eventType_, this->timestamp_, this->value_.c_str());
 
   insert_into_buffer (this);
 }
diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index a748d301c8..c9520562c3 100644
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -222,12 +222,11 @@ class StartLinkEvent : public PajeEvent  {
   Container* container_;
   Type* type_;
   Container* sourceContainer_;
-  char* value_;
-  char* key_;
+  std::string value_;
+  std::string key_;
   int size_;
 
 public:
-  ~StartLinkEvent();
   StartLinkEvent(double timestamp, Container* container, Type* type, Container* sourceContainer, const char* value,
                  const char* key);
   StartLinkEvent(double timestamp, Container* container, Type* type, Container* sourceContainer, const char* value,
-- 
2.20.1