Remove explicit conversion to std::string when it's not required.

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

diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp
index f1ebe44..180eacd 100644 (file)
--- a/src/s4u/s4u_Netzone.cpp
+++ b/src/s4u/s4u_Netzone.cpp
@@ -116,14 +116,14 @@ NetZone* NetZone::seal()
 void NetZone::set_latency_factor_cb(
     std::function<double(double size, const s4u::Host* src, const s4u::Host* dst,
                          const std::vector<s4u::Link*>& /*links*/,
-                         const std::unordered_set<s4u::NetZone*>& /*netzones*/)> const& cb)
+                         const std::unordered_set<s4u::NetZone*>& /*netzones*/)> const& cb) const
 {
   kernel::actor::simcall_answered([this, &cb]() { pimpl_->get_network_model()->set_lat_factor_cb(cb); });
 }
 void NetZone::set_bandwidth_factor_cb(
     std::function<double(double size, const s4u::Host* src, const s4u::Host* dst,
                          const std::vector<s4u::Link*>& /*links*/,
-                         const std::unordered_set<s4u::NetZone*>& /*netzones*/)> const& cb)
+                         const std::unordered_set<s4u::NetZone*>& /*netzones*/)> const& cb) const
 {
   kernel::actor::simcall_answered([this, &cb]() { pimpl_->get_network_model()->set_bw_factor_cb(cb); });
 }
@@ -170,8 +170,8 @@ s4u::SplitDuplexLink* NetZone::create_split_duplex_link(const std::string& name,
   try {
     speed = xbt_parse_get_bandwidth("", 0, bandwidth, "");
   } catch (const simgrid::ParseError&) {
-    throw std::invalid_argument(std::string("Impossible to create split-duplex link: ") + name +
-                                std::string(". Invalid bandwidth: ") + bandwidth);
+    throw std::invalid_argument("Impossible to create split-duplex link: " + name +
+                                ". Invalid bandwidth: " + bandwidth);
   }
   return create_split_duplex_link(name, speed);
 }
@@ -191,8 +191,7 @@ s4u::Link* NetZone::create_link(const std::string& name, const std::vector<std::
       double speed = xbt_parse_get_bandwidth("", 0, speed_str, "");
       bw.push_back(speed);
     } catch (const simgrid::ParseError&) {
-      throw std::invalid_argument(std::string("Impossible to create link: ") + name +
-                                  std::string(". Invalid bandwidth: ") + speed_str);
+      throw std::invalid_argument("Impossible to create link: " + name + ". Invalid bandwidth: " + speed_str);
     }
   }
   return create_link(name, bw);