fix PJ_value class and its methods

[simgrid.git] / src / instr / instr_private.h

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 3788926..963cda9 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -81,8 +81,12 @@ class s_val {
   char *name;
   char *color;
   type_t father;
+  val_t ret;
+  s_val(const char *name, const char *color, type_t father);
+  static val_t PJ_value_get_or_new (const char *name, const char *color, type_t father);
+  static val_t PJ_value_get (const char *name, type_t father);
 };
-typedef s_val s_val_t;
+
 
 //--------------------------------------------------
 typedef enum {
@@ -262,14 +266,6 @@ class NewEvent : public PajeEvent  {
 
 };
 
-class paje_value{
-  public:
-  paje_value(){};
-  ~paje_value(){};
-  val_t PJ_value_new (const char *name, const char *color, type_t father);
-  val_t PJ_value_get (const char *name, type_t father);
-  val_t PJ_value_get_or_new (const char *name, const char *color, type_t father);
-};
 
 extern XBT_PRIVATE xbt_dict_t created_categories;
 extern XBT_PRIVATE xbt_dict_t declared_marks;