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 simgrid::Host into simgrid::s4u::Host
[simgrid.git]
/
src
/
surf
/
surf_routing.cpp
diff --git
a/src/surf/surf_routing.cpp
b/src/surf/surf_routing.cpp
index
b79cae7
..
71d2e46
100644
(file)
--- a/
src/surf/surf_routing.cpp
+++ b/
src/surf/surf_routing.cpp
@@
-23,8
+23,8
@@
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {
-simgrid::
surf
::signal<void(simgrid::surf::NetCard*)> routingEdgeCreatedCallbacks;
-simgrid::
surf
::signal<void(simgrid::surf::As*)> asCreatedCallbacks;
+simgrid::
xbt
::signal<void(simgrid::surf::NetCard*)> routingEdgeCreatedCallbacks;
+simgrid::
xbt
::signal<void(simgrid::surf::As*)> asCreatedCallbacks;
}
}
}
}
@@
-1326,7
+1326,7
@@
xbt_dynar_t surf_AS_get_hosts(simgrid::surf::As *as)
for (int index = 0; index < count; index++) {
sg_netcard_t relm =
xbt_dynar_get_as(elms, index, simgrid::surf::NetCard*);
for (int index = 0; index < count; index++) {
sg_netcard_t relm =
xbt_dynar_get_as(elms, index, simgrid::surf::NetCard*);
- sg_host_t delm = simgrid::Host::by_name_or_null(relm->getName());
+ sg_host_t delm = simgrid::
s4u::
Host::by_name_or_null(relm->getName());
if (delm!=NULL) {
xbt_dynar_push(res, &delm);
}
if (delm!=NULL) {
xbt_dynar_push(res, &delm);
}