A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:simgrid/simgrid into s_type_cleanup
[simgrid.git]
/
src
/
instr
/
instr_private.h
diff --git
a/src/instr/instr_private.h
b/src/instr/instr_private.h
index
a2a6b15
..
e8e38d4
100644
(file)
--- a/
src/instr/instr_private.h
+++ b/
src/instr/instr_private.h
@@
-57,27
+57,27
@@
typedef enum {
} e_entity_types;
//--------------------------------------------------
} e_entity_types;
//--------------------------------------------------
-class s_type;
-typedef s_type *type_t;
-class s_type {
+
+class ess_type {
public:
char *id;
char *name;
char *color;
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
};
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:
public:
- char *id;
- char *name;
- char *color;
type_t father;
value* ret;
value(const char* name, const char* color, type_t father);
type_t father;
value* ret;
value(const char* name, const char* color, type_t father);
@@
-114,7
+114,6
@@
class s_container {
s_container *father;
xbt_dict_t children;
};
s_container *father;
xbt_dict_t children;
};
-typedef s_container s_container_t;
//--------------------------------------------------
class PajeEvent {
//--------------------------------------------------
class PajeEvent {