From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 10 May 2016 20:03:33 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_14~1245
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/48efae676c3604efffe21365b2d525e578fd22e5?hp=09a0b55d933dfe1b6c5e77c6e6b55be1b4e6da66

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

diff --git a/src/simix/ContextBoost.cpp b/src/simix/ContextBoost.cpp
index 38dc3149e3..9108558d6b 100644
--- 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"