From 4d44525bee1bd3bbe44647622f9259dec37cadea Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Thu, 18 Apr 2019 17:28:53 +0200
Subject: [PATCH] Remove custom destructors for instr/paje.

---
 src/instr/instr_paje_types.cpp  | 23 +++--------------------
 src/instr/instr_paje_types.hpp  |  6 ++----
 src/instr/instr_paje_values.hpp |  1 -
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index 3df94374a7..77f7ae99dc 100644
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -36,12 +36,6 @@ Type::~Type()
     delete elm.second;
 }
 
-ValueType::~ValueType()
-{
-  for (auto elm : values_)
-    delete elm.second;
-}
-
 ContainerType::ContainerType(const std::string& name, Type* father) : Type(name, name, "", father)
 {
   XBT_DEBUG("ContainerType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id());
@@ -60,11 +54,6 @@ StateType::StateType(const std::string& name, Type* father) : ValueType(name, fa
   log_definition(PAJE_DefineStateType);
 }
 
-StateType::~StateType()
-{
-  events_.clear();
-}
-
 void StateType::set_event(const std::string& value_name)
 {
   events_.push_back(new StateEvent(issuer_, this, PAJE_SetState, get_entity_value(value_name), nullptr));
@@ -97,11 +86,6 @@ VariableType::VariableType(const std::string& name, const std::string& color, Ty
   log_definition(PAJE_DefineVariableType);
 }
 
-VariableType::~VariableType()
-{
-  events_.clear();
-}
-
 void VariableType::instr_event(double now, double delta, const char* resource, double value)
 {
   /* To trace resource utilization, we use AddEvent and SubEvent only. This implies to add a SetEvent first to set the
@@ -207,10 +191,9 @@ void ValueType::add_entity_value(const std::string& name, const std::string& col
 
   auto it = values_.find(name);
   if (it == values_.end()) {
-    EntityValue* new_val = new EntityValue(name, color, this);
-    values_.insert({name, new_val});
+    auto res = values_.emplace(name, EntityValue(name, color, this));
     XBT_DEBUG("new value %s, child of %s", name.c_str(), get_cname());
-    new_val->print();
+    res.first->second.print();
   }
 }
 
@@ -220,7 +203,7 @@ EntityValue* ValueType::get_entity_value(const std::string& name)
   if (ret == values_.end()) {
     THROWF(tracing_error, 2, "value with name (%s) not found in father type (%s)", name.c_str(), get_cname());
   }
-  return ret->second;
+  return &ret->second;
 }
 
 VariableType* Type::by_name_or_create(const std::string& name, const std::string& color)
diff --git a/src/instr/instr_paje_types.hpp b/src/instr/instr_paje_types.hpp
index eed2593153..9f0ad69326 100644
--- a/src/instr/instr_paje_types.hpp
+++ b/src/instr/instr_paje_types.hpp
@@ -61,7 +61,6 @@ class VariableType : public Type {
   std::vector<VariableEvent*> events_;
 public:
   VariableType(const std::string& name, const std::string& color, Type* father);
-  ~VariableType();
   void instr_event(double now, double delta, const char* resource, double value);
   void set_event(double timestamp, double value);
   void add_event(double timestamp, double value);
@@ -70,10 +69,10 @@ public:
 
 class ValueType : public Type {
 public:
-  std::map<std::string, EntityValue*> values_;
+  std::map<std::string, EntityValue> values_;
   ValueType(const std::string& name, const std::string& alias, Type* father) : Type(name, alias, "", father){};
   ValueType(const std::string& name, Type* father) : Type(name, name, "", father){};
-  virtual ~ValueType();
+  virtual ~ValueType() = default;
   void add_entity_value(const std::string& name, const std::string& color);
   void add_entity_value(const std::string& name);
   EntityValue* get_entity_value(const std::string& name);
@@ -96,7 +95,6 @@ class StateType : public ValueType {
   std::vector<StateEvent*> events_;
 public:
   StateType(const std::string& name, Type* father);
-  ~StateType();
   void set_event(const std::string& value_name);
   void push_event(const std::string& value_name);
   void push_event(const std::string& value_name, TIData* extra);
diff --git a/src/instr/instr_paje_values.hpp b/src/instr/instr_paje_values.hpp
index 4e96d8af13..9014e608b9 100644
--- a/src/instr/instr_paje_values.hpp
+++ b/src/instr/instr_paje_values.hpp
@@ -20,7 +20,6 @@ class EntityValue {
 
 public:
   explicit EntityValue(const std::string& name, const std::string& color, Type* father);
-  ~EntityValue() = default;
   const char* get_cname() { return name_.c_str(); }
   long long int get_id() { return id_; }
   void print();
-- 
2.20.1