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 7be771e..963cda9 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -83,7 +83,8 @@ class s_val {
   type_t father;
   val_t ret;
   s_val(const char *name, const char *color, type_t father);
   type_t father;
   val_t ret;
   s_val(const char *name, const char *color, type_t father);

-  val_t PJ_value_update (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);

 };
 
 
 };
 
 


@@ -265,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;
 
 extern XBT_PRIVATE xbt_dict_t created_categories;
 extern XBT_PRIVATE xbt_dict_t declared_marks;


@@ -362,10 +355,6 @@ XBT_PRIVATE XBT_PRIVATE void PJ_type_free (type_t type);
 /* instr_config.c */
 XBT_PRIVATE void recursiveDestroyType (type_t type);
 
 /* instr_config.c */
 XBT_PRIVATE void recursiveDestroyType (type_t type);
 

-/* instr_paje_values.c */
-XBT_PUBLIC(val_t)  PJ_value_get_or_new (const char *name, const char *color, type_t father);
-XBT_PUBLIC(val_t)  PJ_value_get (const char *name, const type_t father);
-

 XBT_PRIVATE void TRACE_TI_start();
 XBT_PRIVATE void TRACE_TI_end();
 
 XBT_PRIVATE void TRACE_TI_start();
 XBT_PRIVATE void TRACE_TI_end();