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
[trace_mgr] less void*, (some) more doc
[simgrid.git]
/
include
/
simgrid
/
forward.h
diff --git
a/include/simgrid/forward.h
b/include/simgrid/forward.h
index
2961972
..
ecab7aa
100644
(file)
--- a/
include/simgrid/forward.h
+++ b/
include/simgrid/forward.h
@@
-12,40
+12,46
@@
#ifdef __cplusplus
namespace simgrid {
#ifdef __cplusplus
namespace simgrid {
-class Host;
+ namespace s4u {
+ class Host;
+ }
+ namespace surf {
+ class Resource;
+ class Cpu;
+ class NetCard;
+ class As;
+ class Link;
+ }
+ namespace trace_mgr {
+ class future_evt_set;
+ }
}
}
-namespace simgrid {
-namespace surf {
-
-class Cpu;
-class NetCard;
-class As;
-class Link;
-
-}
-}
-
-typedef simgrid::Host simgrid_Host;
+typedef simgrid::s4u::Host simgrid_Host;
+typedef simgrid::surf::As surf_As;
typedef simgrid::surf::Cpu surf_Cpu;
typedef simgrid::surf::NetCard surf_NetCard;
typedef simgrid::surf::Cpu surf_Cpu;
typedef simgrid::surf::NetCard surf_NetCard;
-typedef simgrid::surf::As surf_As;
typedef simgrid::surf::Link Link;
typedef simgrid::surf::Link Link;
+typedef simgrid::surf::Resource surf_Resource;
+typedef simgrid::trace_mgr::future_evt_set sg_future_evt_set;
#else
typedef struct simgrid_Host simgrid_Host;
#else
typedef struct simgrid_Host simgrid_Host;
+typedef struct surf_As surf_As;
typedef struct surf_Cpu surf_Cpu;
typedef struct surf_NetCard surf_NetCard;
typedef struct surf_Cpu surf_Cpu;
typedef struct surf_NetCard surf_NetCard;
-typedef struct surf_
As surf_As
;
+typedef struct surf_
Resource surf_Resource
;
typedef struct Link Link;
typedef struct Link Link;
-
+typedef struct future_evt_set sg_future_evt_set;
#endif
typedef simgrid_Host* sg_host_t;
#endif
typedef simgrid_Host* sg_host_t;
+typedef surf_As *AS_t;
typedef surf_Cpu *surf_cpu_t;
typedef surf_NetCard *sg_netcard_t;
typedef surf_Cpu *surf_cpu_t;
typedef surf_NetCard *sg_netcard_t;
-typedef surf_As *AS_t;
+typedef surf_Resource *sg_resource_t;
+typedef sg_future_evt_set *sg_future_evt_set_t;
// Types which are in fact dictelmt:
typedef xbt_dictelm_t sg_storage_t;
// Types which are in fact dictelmt:
typedef xbt_dictelm_t sg_storage_t;