diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_global_routing.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_global_routing.py index dfabb0e99..002011b7f 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_global_routing.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_global_routing.py @@ -109,16 +109,6 @@ def register_methods(root_module): return def register_Ns3GlobalRouteManager_methods(root_module, cls): - ## global-route-manager.h: static void ns3::GlobalRouteManager::PopulateRoutingTables() [member function] - cls.add_method('PopulateRoutingTables', - 'void', - [], - is_static=True, deprecated=True) - ## global-route-manager.h: static void ns3::GlobalRouteManager::RecomputeRoutingTables() [member function] - cls.add_method('RecomputeRoutingTables', - 'void', - [], - is_static=True, deprecated=True) ## global-route-manager.h: static uint32_t ns3::GlobalRouteManager::AllocateRouterId() [member function] cls.add_method('AllocateRouterId', 'uint32_t', diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_global_routing.py b/bindings/python/apidefs/gcc-LP64/ns3_module_global_routing.py index dfabb0e99..002011b7f 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_global_routing.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_global_routing.py @@ -109,16 +109,6 @@ def register_methods(root_module): return def register_Ns3GlobalRouteManager_methods(root_module, cls): - ## global-route-manager.h: static void ns3::GlobalRouteManager::PopulateRoutingTables() [member function] - cls.add_method('PopulateRoutingTables', - 'void', - [], - is_static=True, deprecated=True) - ## global-route-manager.h: static void ns3::GlobalRouteManager::RecomputeRoutingTables() [member function] - cls.add_method('RecomputeRoutingTables', - 'void', - [], - is_static=True, deprecated=True) ## global-route-manager.h: static uint32_t ns3::GlobalRouteManager::AllocateRouterId() [member function] cls.add_method('AllocateRouterId', 'uint32_t', diff --git a/src/routing/global-routing/global-route-manager.cc b/src/routing/global-routing/global-route-manager.cc index ac5721599..6e2282fb4 100644 --- a/src/routing/global-routing/global-route-manager.cc +++ b/src/routing/global-routing/global-route-manager.cc @@ -32,21 +32,6 @@ namespace ns3 { // // --------------------------------------------------------------------------- - void -GlobalRouteManager::PopulateRoutingTables (void) -{ - BuildGlobalRoutingDatabase (); - InitializeRoutes (); -} - - void -GlobalRouteManager::RecomputeRoutingTables () -{ - DeleteGlobalRoutes (); - BuildGlobalRoutingDatabase (); - InitializeRoutes (); -} - void GlobalRouteManager::DeleteGlobalRoutes () { diff --git a/src/routing/global-routing/global-route-manager.h b/src/routing/global-routing/global-route-manager.h index 74817c407..aab837285 100644 --- a/src/routing/global-routing/global-route-manager.h +++ b/src/routing/global-routing/global-route-manager.h @@ -39,37 +39,6 @@ namespace ns3 { */ class GlobalRouteManager { -public: -/** - * @brief Build a routing database and initialize the routing tables of - * the nodes in the simulation. Makes all nodes in the simulation into - * routers. - * - * All this function does is call the functions - * BuildGlobalRoutingDatabase () and InitializeRoutes (). - * - * @see BuildGlobalRoutingDatabase (); - * @see InitializeRoutes (); - */ - static void PopulateRoutingTables () NS_DEPRECATED; - - /** - *@brief Remove all routes that were previously installed in a prior call - * to either PopulateRoutingTables() or RecomputeRoutingTables(), and - * add a new set of routes. - * - * This method does not change the set of nodes - * over which GlobalRouting is being used, but it will dynamically update - * its representation of the global topology before recomputing routes. - * Users must first call PopulateRoutingTables() and then may subsequently - * call RecomputeRoutingTables() at any later time in the simulation. - * - * @see DeleteGlobalRoutes (); - * @see BuildGlobalRoutingDatabase (); - * @see InitializeRoutes (); - */ - static void RecomputeRoutingTables () NS_DEPRECATED; - public: /** * @brief Allocate a 32-bit router ID from monotonically increasing counter.