unPERLifies a bit the routing: use the object, not its name

[simgrid.git] / src / s4u / s4u_as.cpp

diff --git a/src/s4u/s4u_as.cpp b/src/s4u/s4u_as.cpp
index 6a6f4ca..0a14f8d 100644 (file)
--- a/src/s4u/s4u_as.cpp
+++ b/src/s4u/s4u_as.cpp
@@ -82,14 +82,14 @@ namespace simgrid {
       xbt_assert(!e_route->link_list->empty(), "Bypass route between %s@%s and %s@%s cannot be empty.",
                  e_route->src->name().c_str(), e_route->gw_src->name().c_str(), e_route->dst->name().c_str(),
                  e_route->gw_dst->name().c_str());
-      xbt_assert(bypassRoutes_.find({e_route->src->name(), e_route->dst->name()}) == bypassRoutes_.end(),
+      xbt_assert(bypassRoutes_.find({e_route->src, e_route->dst}) == bypassRoutes_.end(),
                  "The bypass route between %s@%s and %s@%s already exists.", e_route->src->name().c_str(),
                  e_route->gw_src->name().c_str(), e_route->dst->name().c_str(), e_route->gw_dst->name().c_str());
     } else {
       XBT_DEBUG("Load bypassRoute from %s to %s", e_route->src->name().c_str(), e_route->dst->name().c_str());
       xbt_assert(!e_route->link_list->empty(), "Bypass route between %s and %s cannot be empty.",
                  e_route->src->name().c_str(), e_route->dst->name().c_str());
-      xbt_assert(bypassRoutes_.find({e_route->src->name(), e_route->dst->name()}) == bypassRoutes_.end(),
+      xbt_assert(bypassRoutes_.find({e_route->src, e_route->dst}) == bypassRoutes_.end(),
                  "The bypass route between %s and %s already exists.", e_route->src->name().c_str(),
                  e_route->dst->name().c_str());
     }
@@ -100,6 +100,6 @@ namespace simgrid {
       newRoute->push_back(link);
 
     /* Store it */
-    bypassRoutes_.insert({{e_route->src->name(), e_route->dst->name()}, newRoute});
+    bypassRoutes_.insert({{e_route->src, e_route->dst}, newRoute});
   }
 }  }; // namespace simgrid::s4u