From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Wed, 24 May 2017 07:37:54 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3.16~228
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/04cb8833befbe07b6b94ff0cae98bc17b78724e3?hp=1985fd529afd5bf099ad633cd8115cf37c43c126

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

diff --git a/src/bindings/java/jmsg_storage.cpp b/src/bindings/java/jmsg_storage.cpp
index a9f5629ed2..e38230cd64 100644
--- a/src/bindings/java/jmsg_storage.cpp
+++ b/src/bindings/java/jmsg_storage.cpp
@@ -6,7 +6,6 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/msg.h"
-#include "surf/surf_routing.h"
 
 #include "jmsg.h"
 #include "jmsg_storage.h"
diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp
index 3f9a36dc07..6f9f856f35 100644
--- a/src/bindings/lua/lua_platf.cpp
+++ b/src/bindings/lua/lua_platf.cpp
@@ -10,7 +10,6 @@
 #include "src/kernel/routing/NetPoint.hpp"
 #include "src/surf/network_interface.hpp"
 #include "src/surf/xml/platf_private.hpp"
-#include "surf/surf_routing.h"
 #include <ctype.h>
 #include <string.h>
 
diff --git a/src/kernel/routing/NetPoint.cpp b/src/kernel/routing/NetPoint.cpp
index 616fdc5eac..054b8b4e3b 100644
--- a/src/kernel/routing/NetPoint.cpp
+++ b/src/kernel/routing/NetPoint.cpp
@@ -7,7 +7,6 @@
 
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
-#include "surf/surf_routing.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
 
diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 4059783161..e8fdacebc6 100644
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -10,7 +10,6 @@
 
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/trace_mgr.hpp"
-#include "surf/surf_routing.h"
 
 /* Epsilon */
 #define EPSILON 0.000000001
diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index c480530b1d..f544d2f4c9 100644
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -10,7 +10,6 @@
 
 #include "src/surf/surf_private.h"
 #include "surf/surf.h"
-#include "surf/surf_routing.h"
 #include "xbt/str.h"
 
 #include <boost/intrusive/list.hpp>
diff --git a/teshsuite/simdag/is-router/is-router.cpp b/teshsuite/simdag/is-router/is-router.cpp
index 242d10bc89..4a4d891168 100644
--- a/teshsuite/simdag/is-router/is-router.cpp
+++ b/teshsuite/simdag/is-router/is-router.cpp
@@ -7,7 +7,6 @@
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/simdag.h"
 #include "src/kernel/routing/NetPoint.hpp"
-#include "surf/surf_routing.h"
 #include <stdio.h>
 
 int main(int argc, char **argv)