Fix conflict - Adrien

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

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index f384e5f3de186e341e1a65aee91b417b8e74b9a4..888907df9b80839676103c97b8a8f3e7ae4b9096 100644 (file)
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -7,6 +7,8 @@
 #ifndef SURF_NETWORK_CM02_HPP_
 #define SURF_NETWORK_CM02_HPP_
 
+#include <xbt/base.h>
+
 #include "network_interface.hpp"
 #include "xbt/fifo.h"
 #include "xbt/graph.h"
@@ -14,14 +16,14 @@
 /***********
  * Classes *
  ***********/
-class NetworkCm02Model;
-class NetworkCm02Action;
+class XBT_PRIVATE NetworkCm02Model;
+class XBT_PRIVATE NetworkCm02Action;
 
 /*********
  * Tools *
  *********/
 
-void net_define_callbacks(void);
+XBT_PRIVATE void net_define_callbacks(void);
 
 /*********
  * Model *