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
appveyor: flavor mingw over perl in the PATH
[simgrid.git]
/
include
/
simgrid
/
forward.h
diff --git
a/include/simgrid/forward.h
b/include/simgrid/forward.h
index
629feb6
..
ddf58ff
100644
(file)
--- a/
include/simgrid/forward.h
+++ b/
include/simgrid/forward.h
@@
-11,13
+11,13
@@
namespace simgrid {
namespace s4u {
namespace simgrid {
namespace s4u {
+ class As;
class Host;
}
namespace surf {
class Resource;
class Cpu;
class NetCard;
class Host;
}
namespace surf {
class Resource;
class Cpu;
class NetCard;
- class As;
class Link;
}
namespace trace_mgr {
class Link;
}
namespace trace_mgr {
@@
-26,7
+26,7
@@
namespace simgrid {
}
typedef simgrid::s4u::Host simgrid_Host;
}
typedef simgrid::s4u::Host simgrid_Host;
-typedef simgrid::s
urf::As surf
_As;
+typedef simgrid::s
4u::As simgrid
_As;
typedef simgrid::surf::Cpu surf_Cpu;
typedef simgrid::surf::NetCard surf_NetCard;
typedef simgrid::surf::Link Link;
typedef simgrid::surf::Cpu surf_Cpu;
typedef simgrid::surf::NetCard surf_NetCard;
typedef simgrid::surf::Link Link;
@@
-35,7
+35,7
@@
typedef simgrid::surf::Resource surf_Resource;
#else
typedef struct simgrid_Host simgrid_Host;
#else
typedef struct simgrid_Host simgrid_Host;
-typedef struct s
urf_As surf
_As;
+typedef struct s
imgrid_As simgrid
_As;
typedef struct surf_Cpu surf_Cpu;
typedef struct surf_NetCard surf_NetCard;
typedef struct surf_Resource surf_Resource;
typedef struct surf_Cpu surf_Cpu;
typedef struct surf_NetCard surf_NetCard;
typedef struct surf_Resource surf_Resource;
@@
-43,7
+43,8
@@
typedef struct Link Link;
#endif
typedef simgrid_Host* sg_host_t;
#endif
typedef simgrid_Host* sg_host_t;
-typedef surf_As *AS_t;
+typedef simgrid_As *AS_t;
+
typedef surf_Cpu *surf_cpu_t;
typedef surf_NetCard *sg_netcard_t;
typedef surf_Resource *sg_resource_t;
typedef surf_Cpu *surf_cpu_t;
typedef surf_NetCard *sg_netcard_t;
typedef surf_Resource *sg_resource_t;