From: Frederic Suter Date: Fri, 24 Feb 2017 14:21:18 +0000 (+0100) Subject: woops X-Git-Tag: v3_15~290 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1c6d9d13327f8dda85cc1215185196f3466766c1 woops --- diff --git a/src/kernel/routing/DragonflyZone.cpp b/src/kernel/routing/DragonflyZone.cpp index a85ce05190..3e68e8e1d8 100644 --- a/src/kernel/routing/DragonflyZone.cpp +++ b/src/kernel/routing/DragonflyZone.cpp @@ -9,6 +9,7 @@ #include #include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster_dragonfly, surf_route_cluster, "Dragonfly Routing part of surf"); diff --git a/src/kernel/routing/FatTreeZone.cpp b/src/kernel/routing/FatTreeZone.cpp index cb69eef4e0..b74a6cbc7a 100644 --- a/src/kernel/routing/FatTreeZone.cpp +++ b/src/kernel/routing/FatTreeZone.cpp @@ -5,6 +5,7 @@ #include #include +#include #include "src/kernel/routing/FatTreeZone.hpp" #include "src/kernel/routing/NetPoint.hpp" diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 9cb4e2cb3c..33d727a123 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -24,7 +24,7 @@ #include "src/kernel/routing/NetZoneImpl.hpp" #include "src/kernel/routing/TorusZone.hpp" #include "src/kernel/routing/VivaldiZone.hpp" - +#include XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); XBT_PRIVATE xbt_dynar_t mount_list = nullptr; diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp index 2f6bc1d01e..274a939e27 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -19,6 +19,7 @@ #include "xbt/log.h" #include "xbt/misc.h" #include "xbt/str.h" +#include #include "src/surf/xml/platf_private.hpp" @@ -657,7 +658,7 @@ void ETag_surfxml_link(){ link.properties = current_property_set; current_property_set = nullptr; - link.id = A_surfxml_link_id; + link.id = std::string(A_surfxml_link_id); link.bandwidth = surf_parse_get_bandwidth(A_surfxml_link_bandwidth, "bandwidth of link", link.id.c_str()); link.bandwidth_trace = A_surfxml_link_bandwidth___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_bandwidth___file) : nullptr; link.latency = surf_parse_get_time(A_surfxml_link_latency, "latency of link", link.id.c_str()); @@ -714,7 +715,7 @@ void ETag_surfxml_backbone(){ memset(&link,0,sizeof(link)); link.properties = nullptr; - link.id = A_surfxml_backbone_id; + link.id = std::string(A_surfxml_backbone_id); link.bandwidth = surf_parse_get_bandwidth(A_surfxml_backbone_bandwidth, "bandwidth of backbone", link.id.c_str()); link.latency = surf_parse_get_time(A_surfxml_backbone_latency, "latency of backbone", link.id.c_str()); link.policy = SURF_LINK_SHARED;