X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f77a123e30950899367a432165bd2e56123dffb8..3dbeba193df2e406bd9eff5be73c8bce0db0185e:/src/surf/network_ns3.hpp

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index 8aab263632..8a29dfd383 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -1,7 +1,9 @@
 /* Copyright (c) 2004-2014. The SimGrid Team.
- *
- * This program is free software; you can redistribute it and/or modify it
+ * All rights reserved.                                                     */
+
+/* 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. */
+
 #include "network_interface.hpp"
 #include "surf/ns3/ns3_interface.h"
 
@@ -35,7 +37,7 @@ public:
   NetworkNS3Model();
 
   ~NetworkNS3Model();
-  NetworkLinkPtr createResource(const char *name,
+  NetworkLinkPtr createNetworkLink(const char *name,
   	                                 double bw_initial,
   	                                 tmgr_trace_t bw_trace,
   	                                 double lat_initial,
@@ -49,6 +51,7 @@ public:
 		                           double size, double rate);
   double shareResources(double now);
   void updateActionsState(double now, double delta);
+  void addTraces(){DIE_IMPOSSIBLE;}
 };
 
 /************
@@ -90,11 +93,9 @@ void suspend();
 void resume();
 
 //private:
-#ifdef HAVE_TRACING
   double m_lastSent;
   RoutingEdgePtr p_srcElm;
   RoutingEdgePtr p_dstElm;
-#endif //HAVE_TRACING
 };