Fix compilation of NS3 model

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 79252f2..f7f461d 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -13,7 +13,7 @@
 
 #include "ns3/ns3_interface.h"
 #include "ns3/ns3_simulator.h"
-#include "src/surf/network_ns3.hpp"
+#include "network_ns3.hpp"
 
 #include "src/surf/HostImpl.hpp"
 #include "src/surf/surf_private.h"
@@ -167,7 +167,7 @@ static void create_ns3_topology(void)
   std::unordered_set<simgrid::surf::LinkNS3*> already_seen = std::unordered_set<simgrid::surf::LinkNS3*>();
 
   XBT_DEBUG("There is %ld one-link routes",onelink_routes->used);
-  simgrid::surf::Onelink *onelink;
+  simgrid::routing::Onelink *onelink;
   unsigned int iter;
   xbt_dynar_foreach(onelink_routes, iter, onelink) {
     char *src = onelink->src_->name();
@@ -229,7 +229,7 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
 
   routing_model_create(nullptr);
   simgrid::s4u::Host::onCreation.connect(ns3_add_host);
-  simgrid::surf::netcardCreatedCallbacks.connect(ns3_add_netcard);
+  simgrid::routing::netcardCreatedCallbacks.connect(ns3_add_netcard);
   simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster);
   simgrid::surf::on_postparse.connect(&create_ns3_topology);
 
@@ -251,7 +251,7 @@ Link* NetworkNS3Model::createLink(const char *name, double bandwidth, double lat
   return new LinkNS3(this, name, properties, bandwidth, latency);
 }
 
-Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst, double size, double rate)
+Action *NetworkNS3Model::communicate(simgrid::routing::NetCard *src,simgrid::routing::NetCard *dst, double size, double rate)
 {
   return new NetworkNS3Action(this, size, src, dst);
 }
@@ -364,7 +364,7 @@ void LinkNS3::setLatencyTrace(tmgr_trace_t trace) {
  * Action *
  **********/
 
-NetworkNS3Action::NetworkNS3Action(Model *model, double size, NetCard *src, NetCard *dst)
+NetworkNS3Action::NetworkNS3Action(Model *model, double size, simgrid::routing::NetCard *src, simgrid::routing::NetCard *dst)
 : NetworkAction(model, size, false)
 {
   XBT_DEBUG("Communicate from %s to %s", src->name(), dst->name());

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index a92c17d..26de23a 100644 (file)
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -3,25 +3,25 @@
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
+#ifndef NETWORK_NS3_HPP_
+#define NETWORK_NS3_HPP_
+
 
 #include <xbt/base.h>
 
 #include "network_interface.hpp"
 #include "src/surf/ns3/ns3_interface.h"
 
-#ifndef NETWORK_NS3_HPP_
-#define NETWORK_NS3_HPP_
-
 namespace simgrid {
 namespace surf {
 
-class XBT_PRIVATE NetworkNS3Model : public NetworkModel {
+class NetworkNS3Model : public NetworkModel {
 public:
   NetworkNS3Model();
   ~NetworkNS3Model();
   Link* createLink(const char *name, double bandwidth, double latency,
       e_surf_link_sharing_policy_t policy, xbt_dict_t properties) override;
-  Action *communicate(NetCard *src, NetCard *dst, double size, double rate);
+  Action *communicate(routing::NetCard *src, routing::NetCard *dst, double size, double rate);
   double next_occuring_event(double now) override;
   bool next_occuring_event_isIdempotent() {return false;}
   void updateActionsState(double now, double delta) override;
@@ -47,7 +47,7 @@ public:
  **********/
 class XBT_PRIVATE NetworkNS3Action : public NetworkAction {
 public:
-  NetworkNS3Action(Model *model, double cost, NetCard *src, NetCard *dst);
+  NetworkNS3Action(Model *model, double cost, routing::NetCard *src, routing::NetCard *dst);
 
   bool isSuspended();
   int unref();
@@ -56,8 +56,8 @@ public:
 
 //private:
   double lastSent_ = 0;
-  NetCard *src_;
-  NetCard *dst_;
+  routing::NetCard *src_;
+  routing::NetCard *dst_;
 };
 
 }