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
Update XBT_ATTRIB_DEPRECATED_v??? in comments.
[simgrid.git]
/
src
/
s4u
/
s4u_Netzone.cpp
diff --git
a/src/s4u/s4u_Netzone.cpp
b/src/s4u/s4u_Netzone.cpp
index
48377bb
..
b62e620
100644
(file)
--- a/
src/s4u/s4u_Netzone.cpp
+++ b/
src/s4u/s4u_Netzone.cpp
@@
-96,8
+96,8
@@
void NetZone::add_route(const NetZone* src, const NetZone* dst, const std::vecto
pimpl_->add_route(src ? src->get_netpoint() : nullptr, dst ? dst->get_netpoint(): nullptr,
src ? src->get_gateway() : nullptr, dst ? dst->get_gateway() : nullptr,
links_direct, false);
pimpl_->add_route(src ? src->get_netpoint() : nullptr, dst ? dst->get_netpoint(): nullptr,
src ? src->get_gateway() : nullptr, dst ? dst->get_gateway() : nullptr,
links_direct, false);
- pimpl_->add_route(
src ? src->get_netpoint() : nullptr, dst ? dst->get_netpoint()
: nullptr,
-
src ? src->get_gateway() : nullptr, dst ? dst
->get_gateway() : nullptr,
+ pimpl_->add_route(
dst ? dst->get_netpoint(): nullptr, src ? src->get_netpoint()
: nullptr,
+
dst ? dst->get_gateway() : nullptr, src ? src
->get_gateway() : nullptr,
links_reverse, false);
}
links_reverse, false);
}
@@
-110,14
+110,14
@@
void NetZone::add_route(const NetZone* src, const NetZone* dst, const std::vecto
void NetZone::add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
void NetZone::add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
- const std::vector<LinkInRoute>& link_list, bool symmetrical) //XBT_ATTRIB_DEPRECATED_v339
+ const std::vector<LinkInRoute>& link_list, bool symmetrical) //
XBT_ATTRIB_DEPRECATED_v339
{
pimpl_->add_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
}
void NetZone::add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
{
pimpl_->add_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
}
void NetZone::add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
- const std::vector<const Link*>& links) //XBT_ATTRIB_DEPRECATED_v339
+ const std::vector<const Link*>& links) //
XBT_ATTRIB_DEPRECATED_v339
{
std::vector<LinkInRoute> links_direct;
std::vector<LinkInRoute> links_reverse;
{
std::vector<LinkInRoute> links_direct;
std::vector<LinkInRoute> links_reverse;