Merge branch 'master' into disk

[simgrid.git] / include / simgrid / s4u.hpp

diff --git a/include/simgrid/s4u.hpp b/include/simgrid/s4u.hpp
index dcbc463eb3d9be166b96fc7bdea50c50779e67f9..7dc400515aa616900e74b4d9179a8613cd24de57 100644 (file)
--- a/include/simgrid/s4u.hpp
+++ b/include/simgrid/s4u.hpp
@@ -13,6 +13,7 @@
 #include <simgrid/s4u/Barrier.hpp>
 #include <simgrid/s4u/Comm.hpp>
 #include <simgrid/s4u/ConditionVariable.hpp>
 #include <simgrid/s4u/Barrier.hpp>
 #include <simgrid/s4u/Comm.hpp>
 #include <simgrid/s4u/ConditionVariable.hpp>

+#include <simgrid/s4u/Disk.hpp>

 #include <simgrid/s4u/Engine.hpp>
 #include <simgrid/s4u/Exec.hpp>
 #include <simgrid/s4u/Host.hpp>
 #include <simgrid/s4u/Engine.hpp>
 #include <simgrid/s4u/Exec.hpp>
 #include <simgrid/s4u/Host.hpp>