X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/661ccd573b479184dadaf0ca6d2677d5483a7bf0..fceae12df8bc1bfd677832a1f73f899f1fc3e8c6:/src/instr/instr_private.h

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 26bdc555ae..3dee571d22 100644
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -58,32 +58,34 @@ typedef enum {
 
 //--------------------------------------------------
 
-class ess_type {
-  public:
+class Type;
+typedef Type* type_t;
+class Type {
+public:
   char *id;
   char *name;
   char *color;
-};
 
-class s_type;
-typedef s_type *type_t;
-class s_type : public ess_type {
-  public:
   e_entity_types kind;
-  s_type *father;
+  Type *father;
   xbt_dict_t children;
   xbt_dict_t values; //valid for all types except variable and container
-  s_type (const char *typeNameBuff, const char *key, const char *color, e_entity_types kind, type_t father);
-  static type_t s_type_get_or_null (const char *name, type_t father);
-  static type_t s_type_container_new (const char *name, type_t father);
-  static type_t s_type_event_new (const char *name, type_t father);
-  static type_t s_type_variable_new (const char *name, const char *color, type_t father);
-  static type_t s_type_link_new (const char *name, type_t father, type_t source, type_t dest);
+  Type (const char *typeNameBuff, const char *key, const char *color, e_entity_types kind, type_t father);
+  static type_t getOrNull (const char *name, type_t father);
+  static type_t containerNew (const char *name, type_t father);
+  static type_t eventNew (const char *name, type_t father);
+  static type_t variableNew (const char *name, const char *color, type_t father);
+  static type_t linkNew (const char *name, type_t father, type_t source, type_t dest);
+  static type_t stateNew (const char *name, type_t father);
 };
 
 //--------------------------------------------------
-class value : public ess_type{
+class value {
 public:
+  char* id;
+  char* name;
+  char* color;
+
   type_t father;
   value* ret;
   value(const char* name, const char* color, type_t father);
@@ -348,7 +350,6 @@ XBT_PUBLIC(void) PJ_container_remove_from_parent (container_t container);
 /* instr_paje_types.c */
 XBT_PRIVATE void PJ_type_release ();
 XBT_PUBLIC(type_t)  PJ_type_get_root ();
-XBT_PRIVATE type_t PJ_type_state_new (const char *name, type_t father);
 XBT_PUBLIC(type_t)  PJ_type_get (const char *name, const type_t father);
 XBT_PRIVATE XBT_PRIVATE void PJ_type_free (type_t type);