move all inst declarations into their namespace

[simgrid.git] / src / instr / instr_paje_values.cpp

diff --git a/src/instr/instr_paje_values.cpp b/src/instr/instr_paje_values.cpp
index f46eed5..8847a5e 100644 (file)
--- a/src/instr/instr_paje_values.cpp
+++ b/src/instr/instr_paje_values.cpp
@@ -10,12 +10,12 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_values, instr, "Paje tracing event system (values)");
 
-value::value(const char* name, const char* color, type_t father)
+simgrid::instr::Value::Value(const char* name, const char* color, simgrid::instr::Type* father)
 {
   if (name == nullptr || father == nullptr){
     THROWF (tracing_error, 0, "can't create a value with a nullptr name (or a nullptr father)");
   }
-  this->ret         = xbt_new0(value, 1);
+  this->ret         = xbt_new0(Value, 1);
   this->ret->name = xbt_strdup (name);
   this->ret->father = father;
   this->ret->color = xbt_strdup (color);
@@ -29,27 +29,30 @@ value::value(const char* name, const char* color, type_t father)
   LogEntityValue(this->ret);
 };
 
-value::~value()
+simgrid::instr::Value::~Value()
 {
+  /* FIXME: this should be cleanable
   xbt_free(name);
   xbt_free(color);
   xbt_free(id);
+  */
 }
 
-value* value::get_or_new(const char* name, const char* color, type_t father)
+simgrid::instr::Value* simgrid::instr::Value::get_or_new(const char* name, const char* color,
+                                                         simgrid::instr::Type* father)
 {
-  value* ret = 0;
+  Value* ret = 0;
   try {
-    ret = value::get(name, father);
+    ret = Value::get(name, father);
   }
   catch(xbt_ex& e) {
-    value rett(name, color, father);
+    Value rett(name, color, father);
     ret = rett.ret;
   }
   return ret;
 }
 
-value* value::get(const char* name, type_t father)
+simgrid::instr::Value* simgrid::instr::Value::get(const char* name, Type* father)
 {
   if (name == nullptr || father == nullptr){
     THROWF (tracing_error, 0, "can't get a value with a nullptr name (or a nullptr father)");
@@ -57,7 +60,7 @@ value* value::get(const char* name, type_t father)
 
   if (father->kind == TYPE_VARIABLE)
     THROWF(tracing_error, 0, "variables can't have different values (%s)", father->name);
-  value* ret = (value*)xbt_dict_get_or_null(father->values, name);
+  Value* ret = (Value*)xbt_dict_get_or_null(father->values, name);
   if (ret == nullptr) {
     THROWF(tracing_error, 2, "value with name (%s) not found in father type (%s)", name, father->name);
   }