From: Takishipp <toufik.boubehziz@gmail.com>
Date: Wed, 16 Aug 2017 08:58:17 +0000 (+0200)
Subject: Factorize s_type and value instr class
X-Git-Tag: v3_17~203^2^2~11
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a2ff7cc7c5bf86435c85fcc21ca6edc6c20cde3b?hp=5d683c34c73a6dd0492e5332744348f1c6aefd5e

Factorize s_type and value instr class
---

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 45bf1235f2..9cf8031370 100644
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -56,27 +56,27 @@ typedef enum {
 } e_entity_types;
 
 //--------------------------------------------------
-class s_type;
-typedef s_type *type_t;
-class s_type {
+
+class ess_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;
   xbt_dict_t children;
   xbt_dict_t values; //valid for all types except variable and container
 };
 
-typedef s_type s_type_t;
-
 //--------------------------------------------------
-class value {
+class value : public ess_type{
 public:
-  char *id;
-  char *name;
-  char *color;
   type_t father;
   value* ret;
   value(const char* name, const char* color, type_t father);
@@ -113,7 +113,6 @@ class s_container {
   s_container *father;
   xbt_dict_t children;
 };
-typedef s_container s_container_t;
 
 //--------------------------------------------------
 class PajeEvent {