X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ef990547781931de315e21501eaafa920d0687d6..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/surf/trace_mgr.cpp

diff --git a/src/surf/trace_mgr.cpp b/src/surf/trace_mgr.cpp
index d5e70c1f27..944073fa50 100644
--- a/src/surf/trace_mgr.cpp
+++ b/src/surf/trace_mgr.cpp
@@ -1,5 +1,4 @@
-/* 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. */
@@ -121,11 +120,12 @@ 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::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;
@@ -144,9 +144,9 @@ double simgrid::trace_mgr::future_evt_set::next_date() const
   return heap_.empty() ? -1.0 : heap_.top().first;
 }
 
-/** @brief Retrieves the next occurring event, or nullptr if none happens before #date */
+/** @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)