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

[simgrid.git] / src / surf / xml / surfxml_parseplatf.cpp

diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp
index a2bfc94..300bc16 100644 (file)
--- a/src/surf/xml/surfxml_parseplatf.cpp
+++ b/src/surf/xml/surfxml_parseplatf.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2022. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -26,27 +26,27 @@ XBT_PRIVATE std::unordered_map<std::string, std::string> trace_connect_list_link
 void sg_platf_trace_connect(simgrid::kernel::routing::TraceConnectCreationArgs* trace_connect)
 {
   surf_parse_assert(traces_set_list.find(trace_connect->trace) != traces_set_list.end(),
-                    std::string("Cannot connect trace ") + trace_connect->trace + " to " + trace_connect->element +
+                    "Cannot connect trace " + trace_connect->trace + " to " + trace_connect->element +
                         ": trace unknown");
 
   switch (trace_connect->kind) {
     case simgrid::kernel::routing::TraceConnectKind::HOST_AVAIL:
-      trace_connect_list_host_avail.insert({trace_connect->trace, trace_connect->element});
+      trace_connect_list_host_avail.try_emplace(trace_connect->trace, trace_connect->element);
       break;
     case simgrid::kernel::routing::TraceConnectKind::SPEED:
-      trace_connect_list_host_speed.insert({trace_connect->trace, trace_connect->element});
+      trace_connect_list_host_speed.try_emplace(trace_connect->trace, trace_connect->element);
       break;
     case simgrid::kernel::routing::TraceConnectKind::LINK_AVAIL:
-      trace_connect_list_link_avail.insert({trace_connect->trace, trace_connect->element});
+      trace_connect_list_link_avail.try_emplace(trace_connect->trace, trace_connect->element);
       break;
     case simgrid::kernel::routing::TraceConnectKind::BANDWIDTH:
-      trace_connect_list_link_bw.insert({trace_connect->trace, trace_connect->element});
+      trace_connect_list_link_bw.try_emplace(trace_connect->trace, trace_connect->element);
       break;
     case simgrid::kernel::routing::TraceConnectKind::LATENCY:
-      trace_connect_list_link_lat.insert({trace_connect->trace, trace_connect->element});
+      trace_connect_list_link_lat.try_emplace(trace_connect->trace, trace_connect->element);
       break;
     default:
-      surf_parse_error(std::string("Cannot connect trace ") + trace_connect->trace + " to " + trace_connect->element +
+      surf_parse_error("Cannot connect trace " + trace_connect->trace + " to " + trace_connect->element +
                        ": unknown kind of trace");
   }
 }
@@ -66,53 +66,53 @@ void parse_platform_file(const std::string& file)
   const auto engine = simgrid::s4u::Engine::get_instance();
 
   /* connect all profiles relative to hosts */
-  for (auto const& elm : trace_connect_list_host_avail) {
-    surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(),
-                      std::string("<trace_connect kind=\"HOST_AVAIL\">: Trace ") + elm.first + " undefined.");
-    auto profile = traces_set_list.at(elm.first);
+  for (auto const& [trace, name] : trace_connect_list_host_avail) {
+    surf_parse_assert(traces_set_list.find(trace) != traces_set_list.end(),
+                      "<trace_connect kind=\"HOST_AVAIL\">: Trace " + trace + " undefined.");
+    auto profile = traces_set_list.at(trace);
 
-    auto host = engine->host_by_name_or_null(elm.second);
-    surf_parse_assert(host, std::string("<trace_connect kind=\"HOST_AVAIL\">: Host ") + elm.second + " undefined.");
+    auto host = engine->host_by_name_or_null(name);
+    surf_parse_assert(host, "<trace_connect kind=\"HOST_AVAIL\">: Host " + name + " undefined.");
     host->set_state_profile(profile);
   }
 
-  for (auto const& elm : trace_connect_list_host_speed) {
-    surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(),
-                      std::string("<trace_connect kind=\"SPEED\">: Trace ") + elm.first + " undefined.");
-    auto profile = traces_set_list.at(elm.first);
+  for (auto const& [trace, name] : trace_connect_list_host_speed) {
+    surf_parse_assert(traces_set_list.find(trace) != traces_set_list.end(),
+                      "<trace_connect kind=\"SPEED\">: Trace " + trace + " undefined.");
+    auto profile = traces_set_list.at(trace);
 
-    auto host = engine->host_by_name_or_null(elm.second);
-    surf_parse_assert(host, std::string("<trace_connect kind=\"SPEED\">: Host ") + elm.second + " undefined.");
+    auto host = engine->host_by_name_or_null(name);
+    surf_parse_assert(host, "<trace_connect kind=\"SPEED\">: Host " + name + " undefined.");
     host->set_speed_profile(profile);
   }
 
-  for (auto const& elm : trace_connect_list_link_avail) {
-    surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(),
-                      std::string("<trace_connect kind=\"LINK_AVAIL\">: Trace ") + elm.first + " undefined.");
-    auto profile = traces_set_list.at(elm.first);
+  for (auto const& [trace, name] : trace_connect_list_link_avail) {
+    surf_parse_assert(traces_set_list.find(trace) != traces_set_list.end(),
+                      "<trace_connect kind=\"LINK_AVAIL\">: Trace " + trace + " undefined.");
+    auto profile = traces_set_list.at(trace);
 
-    auto link = engine->link_by_name_or_null(elm.second);
-    surf_parse_assert(link, std::string("<trace_connect kind=\"LINK_AVAIL\">: Link ") + elm.second + " undefined.");
+    auto link = engine->link_by_name_or_null(name);
+    surf_parse_assert(link, "<trace_connect kind=\"LINK_AVAIL\">: Link " + name + " undefined.");
     link->set_state_profile(profile);
   }
 
-  for (auto const& elm : trace_connect_list_link_bw) {
-    surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(),
-                      std::string("<trace_connect kind=\"BANDWIDTH\">: Trace ") + elm.first + " undefined.");
-    auto profile = traces_set_list.at(elm.first);
+  for (auto const& [trace, name] : trace_connect_list_link_bw) {
+    surf_parse_assert(traces_set_list.find(trace) != traces_set_list.end(),
+                      "<trace_connect kind=\"BANDWIDTH\">: Trace " + trace + " undefined.");
+    auto profile = traces_set_list.at(trace);
 
-    auto link = engine->link_by_name_or_null(elm.second);
-    surf_parse_assert(link, std::string("<trace_connect kind=\"BANDWIDTH\">: Link ") + elm.second + " undefined.");
+    auto link = engine->link_by_name_or_null(name);
+    surf_parse_assert(link, "<trace_connect kind=\"BANDWIDTH\">: Link " + name + " undefined.");
     link->set_bandwidth_profile(profile);
   }
 
-  for (auto const& elm : trace_connect_list_link_lat) {
-    surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(),
-                      std::string("<trace_connect kind=\"LATENCY\">: Trace ") + elm.first + " undefined.");
-    auto profile = traces_set_list.at(elm.first);
+  for (auto const& [trace, name] : trace_connect_list_link_lat) {
+    surf_parse_assert(traces_set_list.find(trace) != traces_set_list.end(),
+                      "<trace_connect kind=\"LATENCY\">: Trace " + trace + " undefined.");
+    auto profile = traces_set_list.at(trace);
 
-    auto link = engine->link_by_name_or_null(elm.second);
-    surf_parse_assert(link, std::string("<trace_connect kind=\"LATENCY\">: Link ") + elm.second + " undefined.");
+    auto link = engine->link_by_name_or_null(name);
+    surf_parse_assert(link, "<trace_connect kind=\"LATENCY\">: Link " + name + " undefined.");
     link->set_latency_profile(profile);
   }