#ifndef _SURF_SURFXML_PARSE_H
#define _SURF_SURFXML_PARSE_H
-#include "xbt/misc.h"
-#include "xbt/function_types.h"
-#include "xbt/dict.h"
+#include <xbt/dict.h>
+#include <xbt/function_types.h>
+#include <xbt/misc.h>
+#include <xbt/signal.hpp>
SG_BEGIN_DECL()
/* Module management functions */
-XBT_PUBLIC(void) sg_platf_init(void);
-XBT_PUBLIC(void) sg_platf_exit(void);
+XBT_PUBLIC(void) sg_platf_init();;
+XBT_PUBLIC(void) sg_platf_exit();
XBT_PUBLIC(void) surf_parse_open(const char *file);
-XBT_PUBLIC(void) surf_parse_close(void);
+XBT_PUBLIC(void) surf_parse_close();
XBT_PUBLIC(void) surf_parse_assert(bool cond, const char *fmt, ...) XBT_ATTRIB_PRINTF(2,3);
XBT_PUBLIC(void) XBT_ATTRIB_NORETURN surf_parse_error(const char *msg,...) XBT_ATTRIB_PRINTF(1,2);
XBT_PUBLIC(void) surf_parse_warn(const char *msg,...) XBT_ATTRIB_PRINTF(1,2);
XBT_PUBLIC_DATA(int_f_void_t) surf_parse; /* Entry-point to the parser. Set this to your function. */
-
SG_END_DECL()
-namespace simgrid {
-namespace surf {
-
-extern XBT_PRIVATE xbt::signal<void(void)> on_postparse;
-
-}
-}
-
#endif
