cosmetics: use C++ type names

[simgrid.git] / src / surf / network_ns3.hpp

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index c894aa4..75e414e 100644 (file)
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -21,9 +21,9 @@ public:
   ~NetworkNS3Model();
   Link* createLink(const char *name, double bandwidth, double latency,
       e_surf_link_sharing_policy_t policy, xbt_dict_t properties) override;
-  Action *communicate(kernel::routing::NetCard *src, kernel::routing::NetCard *dst, double size, double rate);
-  double next_occuring_event(double now) override;
-  bool next_occuring_event_isIdempotent() {return false;}
+  Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
+  double nextOccuringEvent(double now) override;
+  bool nextOccuringEventIsIdempotent() {return false;}
   void updateActionsState(double now, double delta) override;
 };
 
@@ -36,8 +36,8 @@ public:
   ~LinkNS3();
 
   void apply_event(tmgr_trace_iterator_t event, double value) override;
-  void updateBandwidth(double value) override {THROW_UNIMPLEMENTED;}
-  void updateLatency(double value) override {THROW_UNIMPLEMENTED;}
+  void setBandwidth(double value) override { THROW_UNIMPLEMENTED; }
+  void setLatency(double value) override { THROW_UNIMPLEMENTED; }
   void setBandwidthTrace(tmgr_trace_t trace) override;
   void setLatencyTrace(tmgr_trace_t trace) override;
 };
@@ -47,7 +47,7 @@ public:
  **********/
 class XBT_PRIVATE NetworkNS3Action : public NetworkAction {
 public:
-  NetworkNS3Action(Model *model, double cost, kernel::routing::NetCard *src, kernel::routing::NetCard *dst);
+  NetworkNS3Action(Model* model, double cost, s4u::Host* src, s4u::Host* dst);
 
   bool isSuspended();
   int unref();
@@ -56,8 +56,8 @@ public:
 
 //private:
   double lastSent_ = 0;
-  kernel::routing::NetCard *src_;
-  kernel::routing::NetCard *dst_;
+  s4u::Host* src_;
+  s4u::Host* dst_;
 };
 
 }