Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --git a/src/simix/ContextBoost.cpp b/src/simix/ContextBoost.cpp
index 38dc314..9108558 100644 (file)
--- a/src/simix/ContextBoost.cpp
+++ b/src/simix/ContextBoost.cpp
@@ -18,7 +18,6 @@
 #include <xbt/xbt_os_thread.h>
 
 #include "smx_private.h"
-#include "smx_private.hpp"
 #include "src/internal_config.h"
 #include "src/simix/ContextBoost.hpp"