kill the last remainings of RoutingPlatf

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index bd9d3fe..4056ae5 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -51,11 +51,6 @@ class Action;
 class ActionLmm;
 class StorageActionLmm;
 }
 class ActionLmm;
 class StorageActionLmm;
 }

-namespace kernel {     
-namespace routing {
-class RoutingPlatf;
-}
-}

 }
 
 typedef simgrid::surf::Model surf_Model;
 }
 
 typedef simgrid::surf::Model surf_Model;


@@ -71,7 +66,6 @@ typedef simgrid::surf::NetworkCm02Link surf_NetworkCm02Link;
 typedef simgrid::surf::Action surf_Action;
 typedef simgrid::surf::ActionLmm surf_ActionLmm;
 typedef simgrid::surf::StorageActionLmm surf_StorageActionLmm;
 typedef simgrid::surf::Action surf_Action;
 typedef simgrid::surf::ActionLmm surf_ActionLmm;
 typedef simgrid::surf::StorageActionLmm surf_StorageActionLmm;

-typedef simgrid::kernel::routing::RoutingPlatf surf_RoutingPlatf;

 
 #else
 
 
 #else
 


@@ -88,7 +82,6 @@ typedef struct surf_NetworkCm02Link surf_NetworkCm02Link;
 typedef struct surf_Action surf_Action;
 typedef struct surf_ActionLmm surf_ActionLmm;
 typedef struct surf_StorageActionLmm surf_StorageActionLmm;
 typedef struct surf_Action surf_Action;
 typedef struct surf_ActionLmm surf_ActionLmm;
 typedef struct surf_StorageActionLmm surf_StorageActionLmm;

-typedef struct surf_RoutingPlatf surf_RoutingPlatf;

 
 #endif
 
 
 #endif
 


@@ -118,7 +111,6 @@ typedef surf_Cpu *surf_cpu_t;
  *  \see e_surf_action_state_t
  */
 typedef surf_Action *surf_action_t;
  *  \see e_surf_action_state_t
  */
 typedef surf_Action *surf_action_t;

-typedef surf_RoutingPlatf *routing_platf_t;

 
 typedef struct surf_file *surf_file_t;
 
 
 typedef struct surf_file *surf_file_t;
 


@@ -139,8 +131,6 @@ XBT_PUBLIC(void) model_help(const char *category, s_surf_model_description_t * t
 /* Generic model object */
 /***************************/
 
 /* Generic model object */
 /***************************/
 

-XBT_PUBLIC_DATA(routing_platf_t) routing_platf;
-

 static inline void *surf_storage_resource_priv(const void *storage){
   return (void*)xbt_lib_get_level((xbt_dictelm_t)storage, SURF_STORAGE_LEVEL);
 }
 static inline void *surf_storage_resource_priv(const void *storage){
   return (void*)xbt_lib_get_level((xbt_dictelm_t)storage, SURF_STORAGE_LEVEL);
 }

diff --git a/src/kernel/routing/AsImpl.hpp b/src/kernel/routing/AsImpl.hpp
index ce76236..c064172 100644 (file)
--- a/src/kernel/routing/AsImpl.hpp
+++ b/src/kernel/routing/AsImpl.hpp
@@ -16,7 +16,6 @@
 namespace simgrid {
 namespace kernel {
 namespace routing {
 namespace simgrid {
 namespace kernel {
 namespace routing {

-  class RoutingPlatf; // FIXME: KILLME

   class Onelink;
 
   /** @brief Autonomous Systems
   class Onelink;
 
   /** @brief Autonomous Systems


@@ -48,8 +47,6 @@ namespace routing {
    */
   XBT_PUBLIC_CLASS AsImpl : public s4u::As
   {
    */
   XBT_PUBLIC_CLASS AsImpl : public s4u::As
   {

-    friend simgrid::kernel::routing::RoutingPlatf;
-

   protected:
     explicit AsImpl(As * father, const char* name);
 
   protected:
     explicit AsImpl(As * father, const char* name);
 

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index a0c2e3b..888e3d0 100644 (file)
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -31,7 +31,6 @@ namespace routing {
  ***********/
 
 class XBT_PRIVATE Onelink;
  ***********/
 
 class XBT_PRIVATE Onelink;

-class RoutingPlatf;

 
 class AsRoute {
 public:
 
 class AsRoute {
 public: