fix gcc 6.2 builds

[simgrid.git] / src / simdag / sd_workstation.cpp

diff --git a/src/simdag/sd_workstation.cpp b/src/simdag/sd_workstation.cpp
index ceeb8c1..e4eac88 100644 (file)
--- a/src/simdag/sd_workstation.cpp
+++ b/src/simdag/sd_workstation.cpp
@@ -4,8 +4,9 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "src/simdag/simdag_private.h"
 #include "simgrid/s4u/host.hpp"
+
+#include "simdag_private.hpp"
 #include "src/surf/HostImpl.hpp"
 #include "surf/surf.h"
 
@@ -20,15 +21,15 @@
  */
 SD_link_t *SD_route_get_list(sg_host_t src, sg_host_t dst)
 {
-  std::vector<Link*> *route = new std::vector<Link*>();
-  routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, nullptr);
+  std::vector<Link*> route;
+  src->routeTo(dst, &route, nullptr);
 
   int cpt=0;
-  SD_link_t *list = xbt_new(SD_link_t, route->size());
-  for (auto link : *route)
-    list[cpt++] = link;
-
-  delete route;
+  SD_link_t* list = xbt_new(SD_link_t, route.size());
+  for (auto link : route) {
+    list[cpt] = link;
+    cpt++;
+  }
   return list;
 }
 
@@ -42,10 +43,9 @@ SD_link_t *SD_route_get_list(sg_host_t src, sg_host_t dst)
  */
 int SD_route_get_size(sg_host_t src, sg_host_t dst)
 {
-  std::vector<Link*> *route = new std::vector<Link*>();
-  routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, nullptr);
-  int size = route->size();
-  delete route;
+  std::vector<Link*> route;
+  src->routeTo(dst, &route, nullptr);
+  int size = route.size();
   return size;
 }
 
@@ -60,9 +60,8 @@ int SD_route_get_size(sg_host_t src, sg_host_t dst)
 double SD_route_get_latency(sg_host_t src, sg_host_t dst)
 {
   double latency = 0;
-  std::vector<Link*> *route = new std::vector<Link*>();
-  routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, &latency);
-  delete route;
+  std::vector<Link*> route;
+  src->routeTo(dst, &route, &latency);
 
   return latency;
 }
@@ -80,15 +79,14 @@ double SD_route_get_bandwidth(sg_host_t src, sg_host_t dst)
 {
   double min_bandwidth = -1.0;
 
-  std::vector<Link*> *route = new std::vector<Link*>();
-  routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, nullptr);
+  std::vector<Link*> route;
+  src->routeTo(dst, &route, nullptr);
 
-  for (auto link : *route) {
+  for (auto link : route) {
     double bandwidth = sg_link_bandwidth(link);
-    if (bandwidth < min_bandwidth || min_bandwidth == -1.0)
+    if (bandwidth < min_bandwidth || min_bandwidth < 0.0)
       min_bandwidth = bandwidth;
   }
-  delete route;
 
   return min_bandwidth;
 }