Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Wed, 24 May 2017 07:37:54 +0000 (09:37 +0200)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Wed, 24 May 2017 07:37:54 +0000 (09:37 +0200)
src/bindings/java/jmsg_storage.cpp
src/bindings/lua/lua_platf.cpp
src/kernel/routing/NetPoint.cpp
src/surf/cpu_ti.hpp
src/surf/surf_interface.hpp
teshsuite/simdag/is-router/is-router.cpp

index a9f5629..e38230c 100644 (file)
@@ -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"
index 3f9a36d..6f9f856 100644 (file)
@@ -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>
 
index 616fdc5..054b8b4 100644 (file)
@@ -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");
 
index 4059783..e8fdace 100644 (file)
@@ -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
index c480530..f544d2f 100644 (file)
@@ -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>
index 242d10b..4a4d891 100644 (file)
@@ -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)