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
Attempt to correct error tests
[simgrid.git]
/
include
/
simgrid
/
forward.h
diff --git
a/include/simgrid/forward.h
b/include/simgrid/forward.h
index
5676f8a
..
94f5465
100644
(file)
--- a/
include/simgrid/forward.h
+++ b/
include/simgrid/forward.h
@@
-13,9
+13,11
@@
namespace simgrid {
namespace s4u {
namespace simgrid {
namespace s4u {
- class
NetZone
;
+ class
Actor
;
class Host;
class Host;
+ class Link;
class Mailbox;
class Mailbox;
+ class NetZone;
}
namespace kernel {
namespace activity {
}
namespace kernel {
namespace activity {
@@
-40,38
+42,34
@@
namespace simgrid {
}
}
}
}
-typedef simgrid::s4u::NetZone simgrid_NetZone;
-typedef simgrid::s4u::Host simgrid_Host;
+typedef simgrid::s4u::Actor s4u_Actor;
+typedef simgrid::s4u::Host s4u_Host;
+typedef simgrid::s4u::Link s4u_Link;
+typedef simgrid::s4u::NetZone s4u_NetZone;
typedef simgrid::kernel::activity::ActivityImpl kernel_Activity;
typedef simgrid::kernel::routing::NetPoint routing_NetPoint;
typedef simgrid::kernel::activity::ActivityImpl kernel_Activity;
typedef simgrid::kernel::routing::NetPoint routing_NetPoint;
-typedef simgrid::surf::Cpu surf_Cpu;
-typedef simgrid::surf::LinkImpl Link;
typedef simgrid::surf::Resource surf_Resource;
typedef simgrid::trace_mgr::trace tmgr_Trace;
typedef simgrid::surf::Resource surf_Resource;
typedef simgrid::trace_mgr::trace tmgr_Trace;
-typedef simgrid::simix::Host *smx_host_priv_t;
-
-
#else
#else
-typedef struct simgrid_NetZone simgrid_NetZone;
-typedef struct simgrid_Host simgrid_Host;
+typedef struct s4u_Actor s4u_Actor;
+typedef struct s4u_Host s4u_Host;
+typedef struct s4u_Link s4u_Link;
+typedef struct s4u_NetZone s4u_NetZone;
typedef struct kernel_Activity kernel_Activity;
typedef struct kernel_Activity kernel_Activity;
-typedef struct surf_Cpu surf_Cpu;
typedef struct routing_NetPoint routing_NetPoint;
typedef struct surf_Resource surf_Resource;
typedef struct routing_NetPoint routing_NetPoint;
typedef struct surf_Resource surf_Resource;
-typedef struct Link Link;
typedef struct Trace tmgr_Trace;
typedef struct Trace tmgr_Trace;
-typedef struct simix_Host *smx_host_priv_t;
#endif
#endif
-typedef simgrid_NetZone* NetZone_t;
-typedef simgrid_Host* sg_host_t;
+typedef s4u_NetZone* sg_netzone_t;
+typedef s4u_Host* sg_host_t;
+typedef s4u_Link* sg_link_t;
typedef kernel_Activity *smx_activity_t;
typedef kernel_Activity *smx_activity_t;
-typedef surf_Cpu *surf_cpu_t;
typedef routing_NetPoint* sg_netpoint_t;
typedef surf_Resource *sg_resource_t;
typedef routing_NetPoint* sg_netpoint_t;
typedef surf_Resource *sg_resource_t;