#ifndef SURF_TMGR_H
#define SURF_TMGR_H
-#include "xbt/heap.h"
#include "simgrid/forward.h"
+#include "xbt/heap.h"
+#include "xbt/sysdep.h"
#include <vector>
SG_BEGIN_DECL()
XBT_PUBLIC(void) tmgr_finalize(void);
-XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_file(const char *filename);
-XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_string(const char *id, const char *input, double periodicity);
+XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_file(const char* filename);
+XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_string(const char* id, std::string input, double periodicity);
SG_END_DECL()
virtual ~future_evt_set();
double next_date() const;
tmgr_trace_iterator_t pop_leq(double date, double *value, simgrid::surf::Resource** resource);
- tmgr_trace_iterator_t add_trace(tmgr_trace_t trace, double start_time, simgrid::surf::Resource *resource);
+ tmgr_trace_iterator_t add_trace(tmgr_trace_t trace, simgrid::surf::Resource * resource);
private:
// TODO: use a boost type for the heap (or a ladder queue)