Update copyright notices

[simgrid.git] / src / surf / ns3 / ns3_simulator.h

diff --git a/src/surf/ns3/ns3_simulator.h b/src/surf/ns3/ns3_simulator.h
index 0429c50..04f324a 100644 (file)
--- a/src/surf/ns3/ns3_simulator.h
+++ b/src/surf/ns3/ns3_simulator.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2012. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -12,26 +12,15 @@
 #include "ns3/core-module.h"
 #include "my-point-to-point-helper.h"
 
-#ifdef _NS3_3_10
-  /*NS3 3.10*/
-  #include "ns3/helper-module.h"
-  #include "ns3/simulator-module.h"
-  #include "ns3/node-module.h"
-  #include "ns3/helper-module.h"
-  #include "ns3/global-routing-module.h"
-  #include "ns3/tcp-socket-factory.h"
-#else
-  /*NS3 3.12*/
-  #include "ns3/node.h"
-  #include "ns3/global-route-manager.h"
-  #include "ns3/csma-helper.h"
-  #include "ns3/internet-stack-helper.h"
-  #include "ns3/ipv4-address-helper.h"
-  #include "ns3/point-to-point-helper.h"
-  #include "ns3/packet-sink-helper.h"
-  #include "ns3/inet-socket-address.h"
-  #include "ns3/tcp-socket-factory.h"
-#endif
+#include "ns3/node.h"
+#include "ns3/global-route-manager.h"
+#include "ns3/csma-helper.h"
+#include "ns3/internet-stack-helper.h"
+#include "ns3/ipv4-address-helper.h"
+#include "ns3/point-to-point-helper.h"
+#include "ns3/packet-sink-helper.h"
+#include "ns3/inet-socket-address.h"
+#include "ns3/tcp-socket-factory.h"
 
 using namespace ns3;
 using namespace std;