X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec..07eb08dd092e89871ab3ed9fcf41ad0219598e3b:/src/surf/trace_mgr.cpp diff --git a/src/surf/trace_mgr.cpp b/src/surf/trace_mgr.cpp index d5e70c1f27..c5b9e2f349 100644 --- a/src/surf/trace_mgr.cpp +++ b/src/surf/trace_mgr.cpp @@ -121,7 +121,7 @@ tmgr_trace_t tmgr_trace_new_from_file(std::string filename) } /** @brief Registers a new trace into the future event set, and get an iterator over the integrated trace */ -tmgr_trace_event_t simgrid::trace_mgr::future_evt_set::add_trace(tmgr_trace_t trace, surf::Resource* resource) +tmgr_trace_event_t simgrid::trace_mgr::future_evt_set::add_trace(tmgr_trace_t trace, kernel::model::Resource* resource) { tmgr_trace_event_t trace_iterator = nullptr; @@ -146,7 +146,7 @@ double simgrid::trace_mgr::future_evt_set::next_date() const /** @brief Retrieves the next occurring event, or nullptr if none happens before #date */ tmgr_trace_event_t simgrid::trace_mgr::future_evt_set::pop_leq(double date, double* value, - simgrid::surf::Resource** resource) + kernel::model::Resource** resource) { double event_date = next_date(); if (event_date > date)