X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eee21ec5f99218189fc98898a09150294cd0fbf4..7e4383fd3186c92b1d7151a79c78fa4c4f181f7e:/src/surf/network_gtnets.hpp

diff --git a/src/surf/network_gtnets.hpp b/src/surf/network_gtnets.hpp
index a2af26dade..7f320f4440 100644
--- a/src/surf/network_gtnets.hpp
+++ b/src/surf/network_gtnets.hpp
@@ -1,4 +1,10 @@
-#include "network.hpp"
+/* Copyright (c) 2013-2014. The SimGrid Team.
+ * 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_cm02.hpp"
 
 #ifndef NETWORK_GTNETS_HPP_
 #define NETWORK_GTNETS_HPP_
@@ -15,6 +21,7 @@
 #include "event.h"
 #include "routing-manual.h"
 #include "red.h"
+#include "surf/gtnets/gtnets_topology.h"
 
 xbt_dict_t network_card_ids;
 
@@ -24,9 +31,6 @@ xbt_dict_t network_card_ids;
 class NetworkGTNetsModel;
 typedef NetworkGTNetsModel *NetworkGTNetsModelPtr;
 
-class NetworkGTNetsLink;
-typedef NetworkGTNetsLink *NetworkGTNetsLinkPtr;
-
 class NetworkGTNetsAction;
 typedef NetworkGTNetsAction *NetworkGTNetsActionPtr;
 
@@ -73,7 +77,7 @@ private:
 
    map<int, TCPServer*> p_gtnetsServers;
    map<int, TCPSend*> p_gtnetsClients;
-   map<int, Linkp2p*> p_gtnetsLinks_;
+   map<int, GTLinkp2p*> p_gtnetsLinks_;
    map<int, Node*> p_gtnetsNodes;
    map<void*, int> p_gtnetsActionToFlow;
 
@@ -109,16 +113,12 @@ public:
 
   double m_latency;
   double m_latCurrent;
-#ifdef HAVE_TRACING
   int m_lastRemains;
-#endif
   lmm_variable_t p_variable;
   double m_rate;
   int m_suspended;
-#ifdef HAVE_TRACING
   RoutingEdgePtr src;
   RoutingEdgePtr dst;
-#endif //HAVE_TRACING
 };
 
 #endif /* NETWORK_GTNETS_HPP_ */