X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3f9587e71330e7471ef675d2652cee260a0e3a96..1803cebbea302971155017c36b1cc889a5d725eb:/src/kernel/routing/FloydZone.cpp
diff --git a/src/kernel/routing/FloydZone.cpp b/src/kernel/routing/FloydZone.cpp
index 1c20629d16..894aa18b7f 100644
--- a/src/kernel/routing/FloydZone.cpp
+++ b/src/kernel/routing/FloydZone.cpp
@@ -65,8 +65,8 @@ void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg
route->gw_dst = route_stack.front()->gw_dst;
}
- sg_netcard_t prev_dst_gw = nullptr;
- while (!route_stack.empty()) {
+ sg_netpoint_t prev_dst_gw = nullptr;
+ while (not route_stack.empty()) {
sg_platf_route_cbarg_t e_route = route_stack.back();
route_stack.pop_back();
if (hierarchy_ == RoutingMode::recursive && prev_dst_gw != nullptr &&
@@ -91,7 +91,7 @@ void FloydZone::addRoute(sg_platf_route_cbarg_t route)
addRouteCheckParams(route);
- if (!linkTable_) {
+ if (not linkTable_) {
/* Create Cost, Predecessor and Link tables */
costTable_ = xbt_new0(double, table_size* table_size); /* link cost from host to host */
predecessorTable_ = xbt_new0(int, table_size* table_size); /* predecessor host numbers */
@@ -140,7 +140,7 @@ void FloydZone::addRoute(sg_platf_route_cbarg_t route)
route->gw_dst = gw_tmp;
}
- if (!route->gw_src && !route->gw_dst)
+ if (not route->gw_src && not route->gw_dst)
XBT_DEBUG("Load Route from \"%s\" to \"%s\"", route->dst->name().c_str(), route->src->name().c_str());
else
XBT_DEBUG("Load NetzoneRoute from \"%s(%s)\" to \"%s(%s)\"", route->dst->name().c_str(), route->gw_src->name().c_str(),
@@ -158,7 +158,7 @@ void FloydZone::seal()
/* set the size of table routing */
size_t table_size = vertices_.size();
- if (!linkTable_) {
+ if (not linkTable_) {
/* Create Cost, Predecessor and Link tables */
costTable_ = xbt_new0(double, table_size* table_size); /* link cost from host to host */
predecessorTable_ = xbt_new0(int, table_size* table_size); /* predecessor host numbers */
@@ -177,11 +177,11 @@ void FloydZone::seal()
if (surf_network_model->loopback_ && hierarchy_ == RoutingMode::base) {
for (unsigned int i = 0; i < table_size; i++) {
sg_platf_route_cbarg_t e_route = TO_FLOYD_LINK(i, i);
- if (!e_route) {
+ if (not e_route) {
e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
e_route->gw_src = nullptr;
e_route->gw_dst = nullptr;
- e_route->link_list = new std::vector();
+ e_route->link_list = new std::vector();
e_route->link_list->push_back(surf_network_model->loopback_);
TO_FLOYD_LINK(i, i) = e_route;
TO_FLOYD_PRED(i, i) = i;