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 pull request #193 from Takishipp/signals
[simgrid.git]
/
src
/
surf
/
sg_platf.cpp
diff --git
a/src/surf/sg_platf.cpp
b/src/surf/sg_platf.cpp
index
c9e3c5d
..
79883f4
100644
(file)
--- a/
src/surf/sg_platf.cpp
+++ b/
src/surf/sg_platf.cpp
@@
-120,7
+120,6
@@
simgrid::kernel::routing::NetPoint* sg_platf_new_router(const char* name, const
if (coords && strcmp(coords, ""))
new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords);
if (coords && strcmp(coords, ""))
new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords);
- sg_instr_new_router(name);
return netpoint;
}
return netpoint;
}
@@
-648,7
+647,7
@@
simgrid::s4u::NetZone* sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS)
if (current_routing == nullptr) { /* it is the first one */
xbt_assert(simgrid::s4u::Engine::instance()->pimpl->netRoot_ == nullptr,
if (current_routing == nullptr) { /* it is the first one */
xbt_assert(simgrid::s4u::Engine::instance()->pimpl->netRoot_ == nullptr,
- "All defined components must belong to a
AS
");
+ "All defined components must belong to a
networking zone.
");
simgrid::s4u::Engine::instance()->pimpl->netRoot_ = new_as;
} else {
simgrid::s4u::Engine::instance()->pimpl->netRoot_ = new_as;
} else {