smpirun: make sure that <cluster is on its own line when computing the hostfile autom...

[simgrid.git] / include / xbt.h

diff --git a/include/xbt.h b/include/xbt.h
index 8a528a4..b0a6fa2 100644 (file)
--- a/include/xbt.h
+++ b/include/xbt.h
@@ -1,17 +1,17 @@
-/* $Id$ */
+/* xbt.h - Public interface to the xbt (SimGrid's toolbox)                  */
 
-/* xbt.h - Public interface to the xbt (gras's toolbox)                   */
-
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
+/* Copyright (c) 2004-2018. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef xbt_H
-#define xbt_H
+#ifndef XBT_H
+#define XBT_H
 
 #include <xbt/misc.h>
 #include <xbt/sysdep.h>
+#include <xbt/str.h>
 #include <xbt/function_types.h>
 
 #include <xbt/asserts.h>
@@ -21,12 +21,15 @@
 
 #include <xbt/dynar.h>
 #include <xbt/dict.h>
-#include <xbt/set.h>
-#include <xbt/swag.h>
-#include <xbt/heap.h>
+#include <xbt/parmap.h>
 
-#include <xbt/host.h>
 #include <xbt/config.h>
+#ifdef __cplusplus
+#include <xbt/config.hpp>
+#endif
 #include <xbt/cunit.h>
 
-#endif /* xbt_H */
+#include <xbt/xbt_os_thread.h>
+#include <xbt/xbt_os_time.h>
+
+#endif /* XBT_H */