From 70f9cb513b1dae6350ae04b320ed64f662f29081 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Wed, 30 Sep 2020 02:07:18 +0200 Subject: [PATCH] Weak attempt at fixing issue with recent ns3+gcc. Should not be enough, there's something weird going on. --- src/surf/network_ns3.cpp | 2 +- src/surf/ns3/ns3_simulator.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 358799560d..65d5e7dc61 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -519,7 +519,7 @@ void ns3_simulator(double maxSeconds) } void ns3_add_direct_route(simgrid::kernel::routing::NetPoint* src, simgrid::kernel::routing::NetPoint* dst, double bw, - double lat, std::string link_name, simgrid::s4u::Link::SharingPolicy policy) + double lat, const std::string& link_name, simgrid::s4u::Link::SharingPolicy policy) { ns3::Ipv4AddressHelper address; ns3::NetDeviceContainer netA; diff --git a/src/surf/ns3/ns3_simulator.hpp b/src/surf/ns3/ns3_simulator.hpp index 3500c915da..a09388c1e7 100644 --- a/src/surf/ns3/ns3_simulator.hpp +++ b/src/surf/ns3/ns3_simulator.hpp @@ -30,7 +30,7 @@ public: XBT_PRIVATE void ns3_initialize(std::string TcpProtocol); XBT_PRIVATE void ns3_simulator(double max_seconds); XBT_PRIVATE void ns3_add_direct_route(simgrid::kernel::routing::NetPoint* src, simgrid::kernel::routing::NetPoint* dst, - double bw, double lat, std::string link_name, + double bw, double lat, const std::string& link_name, simgrid::s4u::Link::SharingPolicy policy); class XBT_PRIVATE SgFlow { -- 2.20.1