X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/595e59c568ff5f8510de201bfd800951cdc2adcb..ec28fefa54873e9f38f7005c4ab6d0028f69fa99:/src/surf/trace_mgr_test.cpp diff --git a/src/surf/trace_mgr_test.cpp b/src/surf/trace_mgr_test.cpp index 30b261ef57..4bdb1d7574 100644 --- a/src/surf/trace_mgr_test.cpp +++ b/src/surf/trace_mgr_test.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2017-2018. 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. */ @@ -15,7 +15,7 @@ bool init_unit_test(); // boost forget to give this prototype on NetBSD, which d #include "xbt/log.h" #include "xbt/misc.h" -#include +#include namespace utf = boost::unit_test; namespace tmgr = simgrid::trace_mgr; @@ -28,7 +28,7 @@ public: explicit MockedResource() : simgrid::surf::Resource(nullptr, "fake", nullptr) {} void apply_event(tmgr_trace_event_t event, double value) { - XBT_VERB("t=%.1f: Change value to %lg (idx: %d)", thedate, value, event->idx); + XBT_VERB("t=%.1f: Change value to %lg (idx: %u)", thedate, value, event->idx); tmgr_trace_event_unref(&event); } bool isUsed() { return true; } @@ -39,7 +39,7 @@ static void trace2vector(const char* str, std::vector* whereto simgrid::trace_mgr::trace* trace = tmgr_trace_new_from_string("TheName", str, 0); XBT_VERB("---------------------------------------------------------"); XBT_VERB("data>>\n%s<event_list) + for (auto const& evt : trace->event_list) XBT_VERB("event: d:%lg v:%lg", evt.date_, evt.value_); MockedResource daResource; @@ -59,7 +59,7 @@ static void trace2vector(const char* str, std::vector* whereto res->apply_event(it, value); whereto->push_back(tmgr::DatedValue(thedate, value)); } else { - XBT_DEBUG("%.1f: ignore an event (idx: %d)\n", thedate, it->idx); + XBT_DEBUG("%.1f: ignore an event (idx: %u)\n", thedate, it->idx); } } tmgr_finalize();