-/* Copyright (c) 2004-2005, 2007, 2009-2014, 2016-2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-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. */
}
/** @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::resource::Resource* resource)
{
tmgr_trace_event_t trace_iterator = nullptr;
- trace_iterator = new s_tmgr_trace_event_t;
+ trace_iterator = new simgrid::kernel::resource::TraceEvent();
trace_iterator->trace = trace;
trace_iterator->idx = 0;
trace_iterator->resource = resource;
/** @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::resource::Resource** resource)
{
double event_date = next_date();
if (event_date > date)