untangle resource::state (ON/OFF) and VM::state (STARTED/MIGRATING/etc)

[simgrid.git] / src / include / surf / trace_mgr.h

diff --git a/src/include/surf/trace_mgr.h b/src/include/surf/trace_mgr.h
index 3394dec..62cf3ac 100644 (file)
--- a/src/include/surf/trace_mgr.h
+++ b/src/include/surf/trace_mgr.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2005, 2006, 2007, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004-2007, 2009-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,13 +9,11 @@
 
 #include "xbt/heap.h"
 #include "xbt/dynar.h"
-#include "surf/solver.h"
+#include "surf/maxmin.h"
 #include "surf/datatypes.h"
 #include "simgrid/platf_interface.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+SG_BEGIN_DECL()
 
 /* Creation functions */
 XBT_PUBLIC(tmgr_history_t) tmgr_history_new(void);
@@ -47,8 +45,6 @@ XBT_PUBLIC(tmgr_trace_event_t)
 
 XBT_PUBLIC(void) tmgr_finalize(void);
 
-#ifdef __cplusplus
-}
-#endif
+SG_END_DECL()
 
 #endif                          /* _SURF_TMGR_H */