give simgrid::Host a p_cpu field instead of relying on extensions for non-optional...

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

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index 82bcc7e..1923e55 100644 (file)
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -1,11 +1,13 @@
-/* Copyright (c) 2004-2014. The SimGrid Team.
+/* Copyright (c) 2004-2015. 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 <xbt/base.h>
+
 #include "network_interface.hpp"
-#include "surf/ns3/ns3_interface.h"
+#include "src/surf/ns3/ns3_interface.h"
 
 #ifndef NETWORK_NS3_HPP_
 #define NETWORK_NS3_HPP_
@@ -13,19 +15,29 @@
 /***********
  * Classes *
  ***********/
-class NetworkNS3Model;
-class NetworkNS3Action;
+
+namespace simgrid {
+namespace surf {
+
+class XBT_PRIVATE NetworkNS3Model;
+class XBT_PRIVATE NetworkNS3Action;
+
+}
+}
 
 /*********
  * Tools *
  *********/
 
-void net_define_callbacks(void);
+XBT_PRIVATE void net_define_callbacks(void);
 
 /*********
  * Model *
  *********/
 
+namespace simgrid {
+namespace surf {
+
 class NetworkNS3Model : public NetworkModel {
 public:
   NetworkNS3Model();
@@ -93,5 +105,7 @@ void resume();
   RoutingEdge *p_dstElm;
 };
 
+}
+}
 
 #endif /* NETWORK_NS3_HPP_ */