ns3: cleanups in the headers

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 5689fec..8dac14b 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* 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. */
 
 /* 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. */


@@ -10,8 +10,13 @@
 #include "xbt/string.hpp"
 #include "xbt/utility.hpp"
 
 #include "xbt/string.hpp"
 #include "xbt/utility.hpp"
 

-#include "ns3/core-module.h"
-#include "ns3/node.h"
+#include <ns3/core-module.h>
+#include <ns3/csma-helper.h>
+#include <ns3/global-route-manager.h>
+#include <ns3/internet-stack-helper.h>
+#include <ns3/ipv4-address-helper.h>
+#include <ns3/packet-sink-helper.h>
+#include <ns3/point-to-point-helper.h>

 
 #include "network_ns3.hpp"
 #include "ns3/ns3_simulator.hpp"
 
 #include "network_ns3.hpp"
 #include "ns3/ns3_simulator.hpp"

diff --git a/src/surf/ns3/ns3_interface.hpp b/src/surf/ns3/ns3_interface.hpp
index a1c523f..a8ea409 100644 (file)
--- a/src/surf/ns3/ns3_interface.hpp
+++ b/src/surf/ns3/ns3_interface.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* 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. */
 
 /* 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. */

diff --git a/src/surf/ns3/ns3_simulator.cpp b/src/surf/ns3/ns3_simulator.cpp
index 8b43e80..1ced7bc 100644 (file)
--- a/src/surf/ns3/ns3_simulator.cpp
+++ b/src/surf/ns3/ns3_simulator.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* 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. */
 
 /* 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. */


@@ -7,6 +7,9 @@
 #include "xbt/log.h"
 #include "xbt/sysdep.h"
 
 #include "xbt/log.h"
 #include "xbt/sysdep.h"
 

+#include <ns3/ipv4-address-helper.h>
+#include <ns3/point-to-point-helper.h>
+

 #include <algorithm>
 
 std::map<std::string, SgFlow*> flowFromSock; // ns3::sock -> SgFlow
 #include <algorithm>
 
 std::map<std::string, SgFlow*> flowFromSock; // ns3::sock -> SgFlow

diff --git a/src/surf/ns3/ns3_simulator.hpp b/src/surf/ns3/ns3_simulator.hpp
index 743f003..dcf378e 100644 (file)
--- a/src/surf/ns3/ns3_simulator.hpp
+++ b/src/surf/ns3/ns3_simulator.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* 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. */
 
 /* 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. */


@@ -6,18 +6,12 @@
 #ifndef NS3_SIMULATOR_HPP
 #define NS3_SIMULATOR_HPP
 
 #ifndef NS3_SIMULATOR_HPP
 #define NS3_SIMULATOR_HPP
 

-#include <cstdint>
-

 #include "ns3_interface.hpp"
 
 #include "ns3_interface.hpp"
 

-#include <ns3/csma-helper.h>
-#include <ns3/global-route-manager.h>
-#include <ns3/internet-stack-helper.h>
-#include <ns3/ipv4-address-helper.h>
-#include <ns3/packet-sink-helper.h>
-#include <ns3/point-to-point-helper.h>

 #include <ns3/tcp-socket-factory.h>
 
 #include <ns3/tcp-socket-factory.h>
 

+#include <cstdint>
+

 class XBT_PRIVATE SgFlow {
 public:
   SgFlow(uint32_t totalBytes, simgrid::surf::NetworkNS3Action* action);
 class XBT_PRIVATE SgFlow {
 public:
   SgFlow(uint32_t totalBytes, simgrid::surf::NetworkNS3Action* action);