X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf2a7c6a685a2a56113882f9cf278849e315fd32..79853b8925152a5b89d3f8f44d64ffaf284a0196:/src/surf/trace_mgr.hpp diff --git a/src/surf/trace_mgr.hpp b/src/surf/trace_mgr.hpp index 5e19d547ce..d78d4de20d 100644 --- a/src/surf/trace_mgr.hpp +++ b/src/surf/trace_mgr.hpp @@ -22,9 +22,6 @@ typedef struct tmgr_trace_event { } s_tmgr_trace_event_t; typedef struct tmgr_trace_event* tmgr_trace_event_t; -/* Creation functions */ -XBT_PUBLIC(tmgr_trace_t) tmgr_empty_trace_new(void); -XBT_PUBLIC(void) tmgr_trace_free(tmgr_trace_t trace); /** * \brief Free a trace event structure * @@ -34,7 +31,7 @@ XBT_PUBLIC(void) tmgr_trace_free(tmgr_trace_t trace); */ XBT_PUBLIC(void) tmgr_trace_event_unref(tmgr_trace_event_t* trace_event); -XBT_PUBLIC(void) tmgr_finalize(void); +XBT_PUBLIC(void) tmgr_finalize(); 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); @@ -62,7 +59,7 @@ public: explicit DatedValue() = default; explicit DatedValue(double d, double v) : date_(d), value_(v) {} bool operator==(DatedValue e2); - bool operator!=(DatedValue e2) { return !(*this == e2); } + bool operator!=(DatedValue e2) { return not(*this == e2); } }; std::ostream& operator<<(std::ostream& out, const DatedValue& e); @@ -79,7 +76,7 @@ XBT_PUBLIC_CLASS trace_event{ XBT_PUBLIC_CLASS trace { public: /** Creates an empty trace */ - trace(); + explicit trace(); virtual ~trace(); //private: std::vector event_list; @@ -97,7 +94,7 @@ public: private: // TODO: use a boost type for the heap (or a ladder queue) - xbt_heap_t p_heap = xbt_heap_new(8, xbt_free_f); /* Content: only trace_events (yep, 8 is an arbitrary value) */ + xbt_heap_t heap_ = xbt_heap_new(8, xbt_free_f); /* Content: only trace_events (yep, 8 is an arbitrary value) */ }; }} // namespace simgrid::trace_mgr