cleanups and simplifications to our build system

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

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index 2b28eed..8a29dfd 100644 (file)
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -37,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,
@@ -51,6 +51,7 @@ public:
                                           double size, double rate);
   double shareResources(double now);
   void updateActionsState(double now, double delta);
+  void addTraces(){DIE_IMPOSSIBLE;}
 };
 
 /************
@@ -92,11 +93,9 @@ void suspend();
 void resume();
 
 //private:
-#ifdef HAVE_TRACING
   double m_lastSent;
   RoutingEdgePtr p_srcElm;
   RoutingEdgePtr p_dstElm;
-#endif //HAVE_TRACING
 };