From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 5 Mar 2018 22:01:16 +0000 (+0100)
Subject: ns3: inline a header file
X-Git-Tag: v3.19~153
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d06a3c5e9caef9c7da9cdeca1a864c5ca253158a?hp=9453a72a7bca10ac53797ce67f9310c800541934

ns3: inline a header file
---

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index fdb5683513..ae7f9bdd61 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2017. The SimGrid Team.  All rights reserved.         */
+/* Copyright (c) 2004-2018. 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. */
@@ -9,7 +9,6 @@
 #include "xbt/base.h"
 
 #include "network_interface.hpp"
-#include "src/surf/ns3/ns3_interface.hpp"
 
 namespace simgrid {
 namespace surf {
diff --git a/src/surf/ns3/ns3_interface.hpp b/src/surf/ns3/ns3_interface.hpp
deleted file mode 100644
index 2d18e61b27..0000000000
--- a/src/surf/ns3/ns3_interface.hpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright (c) 2007-2018. 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. */
-
-#ifndef NS3_INTERFACE_HPP
-#define NS3_INTERFACE_HPP
-
-#include "ns3/ptr.h"
-#include "simgrid/s4u/Host.hpp"
-
-namespace simgrid {
-namespace surf {
-class NetworkNS3Action;
-}
-}
-namespace ns3 {
-class Node;
-}
-
-class NetPointNs3 {
-public:
-  static simgrid::xbt::Extension<simgrid::kernel::routing::NetPoint, NetPointNs3> EXTENSION_ID;
-
-  explicit NetPointNs3();
-  int node_num;
-  ns3::Ptr<ns3::Node> ns3Node_;
-};
-
-XBT_PUBLIC(void) ns3_initialize(std::string TcpProtocol);
-extern "C" {
-XBT_PUBLIC(void) ns3_simulator(double maxSeconds);
-XBT_PUBLIC(void) ns3_add_link(NetPointNs3* src, NetPointNs3* dst, double bw, double lat);
-XBT_PUBLIC(void) ns3_add_cluster(const char* id, double bw, double lat);
-}
-
-#endif
diff --git a/src/surf/ns3/ns3_simulator.hpp b/src/surf/ns3/ns3_simulator.hpp
index dcf378e55e..602f0b9304 100644
--- a/src/surf/ns3/ns3_simulator.hpp
+++ b/src/surf/ns3/ns3_simulator.hpp
@@ -6,12 +6,35 @@
 #ifndef NS3_SIMULATOR_HPP
 #define NS3_SIMULATOR_HPP
 
-#include "ns3_interface.hpp"
+#include "simgrid/s4u/Host.hpp"
 
+#include <ns3/node.h>
 #include <ns3/tcp-socket-factory.h>
 
 #include <cstdint>
 
+namespace simgrid {
+namespace surf {
+class NetworkNS3Action;
+}
+} // namespace simgrid
+
+class NetPointNs3 {
+public:
+  static simgrid::xbt::Extension<simgrid::kernel::routing::NetPoint, NetPointNs3> EXTENSION_ID;
+
+  explicit NetPointNs3();
+  int node_num;
+  ns3::Ptr<ns3::Node> ns3Node_;
+};
+
+XBT_PUBLIC(void) ns3_initialize(std::string TcpProtocol);
+extern "C" {
+XBT_PUBLIC(void) ns3_simulator(double maxSeconds);
+XBT_PUBLIC(void) ns3_add_link(NetPointNs3* src, NetPointNs3* dst, double bw, double lat);
+XBT_PUBLIC(void) ns3_add_cluster(const char* id, double bw, double lat);
+}
+
 class XBT_PRIVATE SgFlow {
 public:
   SgFlow(uint32_t totalBytes, simgrid::surf::NetworkNS3Action* action);
diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index a84619b3f0..242ef4146e 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -42,7 +42,6 @@ set(EXTRA_DIST
   src/surf/network_ns3.hpp
   src/surf/network_smpi.hpp
   src/surf/network_ib.hpp
-  src/surf/ns3/ns3_interface.hpp
   src/surf/ns3/ns3_simulator.hpp
   src/surf/trace_mgr_test.cpp
   src/surf/xml/simgrid.dtd