cosmetics

diff --git a/src/surf/ns3/ns3_interface.h b/src/surf/ns3/ns3_interface.h
index 9adccba..5445afa 100644 (file)
--- a/src/surf/ns3/ns3_interface.h
+++ b/src/surf/ns3/ns3_interface.h
@@ -6,14 +6,7 @@
 #ifndef _NS3_INTERFACE_H
 #define _NS3_INTERFACE_H
 
 #ifndef _NS3_INTERFACE_H
 #define _NS3_INTERFACE_H
 

-#include "xbt/log.h"
-#include "xbt/dynar.h"
-#include "xbt/misc.h"
-#include "xbt/sysdep.h"
-#include <xbt/Extendable.hpp>
-

 #include <simgrid/s4u/host.hpp>
 #include <simgrid/s4u/host.hpp>

-#include <surf/surf_routing.h>

 
 namespace simgrid{
   namespace surf{
 
 namespace simgrid{
   namespace surf{

diff --git a/src/surf/ns3/ns3_simulator.h b/src/surf/ns3/ns3_simulator.h
index 1114a72..8048638 100644 (file)
--- a/src/surf/ns3/ns3_simulator.h
+++ b/src/surf/ns3/ns3_simulator.h
@@ -7,21 +7,16 @@
 #ifndef _NS3_SIM_H
 #define _NS3_SIM_H
 
 #ifndef _NS3_SIM_H
 #define _NS3_SIM_H
 

-#ifdef __cplusplus
-

 #include <cstdint>
 
 #include "ns3_interface.h"
 #include <cstdint>
 
 #include "ns3_interface.h"

-#include <ns3/core-module.h>

 
 

-#include <ns3/node.h>

 #include <ns3/global-route-manager.h>
 #include <ns3/csma-helper.h>
 #include <ns3/internet-stack-helper.h>
 #include <ns3/ipv4-address-helper.h>
 #include <ns3/point-to-point-helper.h>
 #include <ns3/packet-sink-helper.h>
 #include <ns3/global-route-manager.h>
 #include <ns3/csma-helper.h>
 #include <ns3/internet-stack-helper.h>
 #include <ns3/ipv4-address-helper.h>
 #include <ns3/point-to-point-helper.h>
 #include <ns3/packet-sink-helper.h>

-#include <ns3/inet-socket-address.h>

 #include <ns3/tcp-socket-factory.h>
 
 class SgFlow {
 #include <ns3/tcp-socket-factory.h>
 
 class SgFlow {


@@ -49,6 +44,4 @@ static inline const char *transformSocketPtr (ns3::Ptr<ns3::Socket> localSocket)
   return key;
 }
 
   return key;
 }
 

-#endif                          /* __cplusplus */
-

 #endif
 #endif

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 15d2df7..73f817c 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -111,7 +111,6 @@ void sg_platf_new_host(sg_platf_host_cbarg_t args)
 /** @brief Add a "router" to the network element list */
 void sg_platf_new_router(sg_platf_router_cbarg_t router)
 {
 /** @brief Add a "router" to the network element list */
 void sg_platf_new_router(sg_platf_router_cbarg_t router)
 {

-  using simgrid::kernel::routing::AsCluster;

   simgrid::kernel::routing::AsImpl* current_routing = routing_get_current();
 
   if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset)
   simgrid::kernel::routing::AsImpl* current_routing = routing_get_current();
 
   if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset)


@@ -142,7 +141,7 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router)
     xbt_lib_set(as_router_lib, router->id, COORD_ASR_LEVEL, (void *) ctn);
   }
 
     xbt_lib_set(as_router_lib, router->id, COORD_ASR_LEVEL, (void *) ctn);
   }
 

-  auto cluster = dynamic_cast<AsCluster*>(current_routing);
+  auto cluster = dynamic_cast<simgrid::kernel::routing::AsCluster*>(current_routing);

   if(cluster != nullptr)
     cluster->router_ = static_cast<simgrid::kernel::routing::NetCard*>(xbt_lib_get_or_null(as_router_lib, router->id, ROUTING_ASR_LEVEL));
 
   if(cluster != nullptr)
     cluster->router_ = static_cast<simgrid::kernel::routing::NetCard*>(xbt_lib_get_or_null(as_router_lib, router->id, ROUTING_ASR_LEVEL));