X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b1e4e803685007394a5a9b63ab87339d3bf35657..5c5d6ea37067c9a9f429d1aa07c364ca47a29f21:/src/surf/network_ns3.hpp

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index b04d5c98b0..417b15b3bd 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2014. The SimGrid Team.
+/* Copyright (c) 2004-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -14,10 +14,7 @@
  * Classes *
  ***********/
 class NetworkNS3Model;
-typedef NetworkNS3Model *NetworkNS3ModelPtr;
-
 class NetworkNS3Action;
-typedef NetworkNS3Action *NetworkNS3ActionPtr;
 
 /*********
  * Tools *
@@ -43,12 +40,13 @@ public:
   	                                 tmgr_trace_t state_trace,
   	                                 e_surf_link_sharing_policy_t policy,
   	                                 xbt_dict_t properties);
-  xbt_dynar_t getRoute(RoutingEdgePtr src, RoutingEdgePtr dst);
-  ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
+  xbt_dynar_t getRoute(RoutingEdge *src, RoutingEdge *dst);
+  Action *communicate(RoutingEdge *src, RoutingEdge *dst,
 		                           double size, double rate);
   double shareResources(double now);
   void updateActionsState(double now, double delta);
   void addTraces(){DIE_IMPOSSIBLE;}
+  bool shareResourcesIsIdempotent() {return false;}
 };
 
 /************
@@ -56,7 +54,7 @@ public:
  ************/
 class NetworkNS3Link : public Link {
 public:
-  NetworkNS3Link(NetworkNS3ModelPtr model, const char *name, xbt_dict_t props,
+  NetworkNS3Link(NetworkNS3Model *model, const char *name, xbt_dict_t props,
   		         double bw_initial, double lat_initial);
   ~NetworkNS3Link();
 
@@ -78,7 +76,7 @@ public:
  **********/
 class NetworkNS3Action : public NetworkAction {
 public:
-  NetworkNS3Action(ModelPtr model, double cost, bool failed);
+  NetworkNS3Action(Model *model, double cost, bool failed);
 
 #ifdef HAVE_LATENCY_BOUND_TRACKING
   int getLatencyLimited();
@@ -91,8 +89,8 @@ void resume();
 
 //private:
   double m_lastSent;
-  RoutingEdgePtr p_srcElm;
-  RoutingEdgePtr p_dstElm;
+  RoutingEdge *p_srcElm;
+  RoutingEdge *p_dstElm;
 };