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>
Fri, 26 Feb 2016 21:42:25 +0000 (22:42 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Fri, 26 Feb 2016 21:42:25 +0000 (22:42 +0100)
include/simgrid/s4u/host.hpp
src/s4u/s4u_host.cpp
src/simgrid/host.cpp

index c235cc5..2e5144a 100644 (file)
@@ -111,7 +111,6 @@ public:
 
 extern int MSG_HOST_LEVEL;
 extern int SIMIX_HOST_LEVEL;
-extern int ROUTING_HOST_LEVEL;
 extern int USER_HOST_LEVEL;
 
 #endif /* SIMGRID_S4U_HOST_HPP */
index e1c5097..892337c 100644 (file)
@@ -22,7 +22,6 @@
 
 int MSG_HOST_LEVEL;
 int SIMIX_HOST_LEVEL;
-int ROUTING_HOST_LEVEL;
 int USER_HOST_LEVEL;
 
 namespace simgrid {
index da0f26d..99aa45e 100644 (file)
@@ -86,10 +86,6 @@ void sg_host_init()
     __MSG_host_priv_free((msg_host_priv_t) p);
   });
 
-  ROUTING_HOST_LEVEL = simgrid::s4u::Host::extension_create([](void *p) {
-    delete static_cast<simgrid::surf::NetCard*>(p);
-  });
-
   SIMIX_HOST_LEVEL = simgrid::s4u::Host::extension_create(SIMIX_host_destroy);
   USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(NULL);
 }