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

diff --git a/src/surf/trace_mgr.hpp b/src/surf/trace_mgr.hpp
index bcd2151a92..b1456be7ab 100644
--- a/src/surf/trace_mgr.hpp
+++ b/src/surf/trace_mgr.hpp
@@ -8,10 +8,10 @@
 
 #include "simgrid/forward.h"
 #include "xbt/sysdep.h"
+
 #include <queue>
 #include <vector>
 
-
 /* Iterator within a trace */
 namespace simgrid {
 namespace kernel {
@@ -20,7 +20,7 @@ class TraceEvent {
 public:
   tmgr_trace_t trace;
   unsigned int idx;
-  sg_resource_t resource;
+  Resource* resource;
   bool free_me;
 };
 
@@ -28,7 +28,7 @@ public:
 } // namespace kernel
 } // namespace simgrid
 typedef simgrid::kernel::resource::TraceEvent* tmgr_trace_event_t;
-extern "C" {
+extern XBT_PRIVATE simgrid::trace_mgr::future_evt_set* future_evt_set;
 
 /**
  * \brief Free a trace event structure
@@ -43,18 +43,17 @@ XBT_PUBLIC void tmgr_finalize();
 
 XBT_PUBLIC tmgr_trace_t tmgr_trace_new_from_file(std::string filename);
 XBT_PUBLIC tmgr_trace_t tmgr_trace_new_from_string(std::string id, std::string input, double periodicity);
-}
 
 namespace simgrid {
 /** @brief Modeling of the availability profile (due to an external load) or the churn
  *
  * There is 4 main concepts in this module:
- * - #DatedValue: a pair <timestamp, value> (both are of type double)
- * - #trace: a list of dated values
- * - #trace_event: links a given trace to a given SimGrid resource.
+ * - #simgrid::trace_mgr::DatedValue: a pair <timestamp, value> (both are of type double)
+ * - #simgrid::trace_mgr::trace: a list of dated values
+ * - #simgrid::trace_mgr::trace_event: links a given trace to a given SimGrid resource.
  *   A Cpu for example has 2 kinds of events: state (ie, is it ON/OFF) and speed,
  *   while a link has 3 iterators: state, bandwidth and latency.
- * - #future_evt_set: makes it easy to find the next occuring event of all traces
+ * - #simgrid::trace_mgr::future_evt_set: makes it easy to find the next occuring event of all traces
  */
 namespace trace_mgr {
 class XBT_PUBLIC DatedValue {