From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 6 Apr 2018 05:54:47 +0000 (+0200)
Subject: move the definition of surf_network_model in a lame attempt to fix windows
X-Git-Tag: v3.20~513
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/8fbc6ef2297d67e64590b2ad7073ea8e131d5f4f

move the definition of surf_network_model in a lame attempt to fix windows
---

diff --git a/src/include/surf/surf.hpp b/src/include/surf/surf.hpp
index 06fab3fd9c..3d6a2bb83c 100644
--- a/src/include/surf/surf.hpp
+++ b/src/include/surf/surf.hpp
@@ -135,14 +135,6 @@ XBT_PUBLIC_DATA s_surf_model_description_t surf_plugin_description[];
  */
 XBT_PUBLIC_DATA s_surf_model_description_t surf_cpu_model_description[];
 
-/** \ingroup SURF_models
- *  \brief The network model
- *
- *  When creating a new API on top on SURF, you shouldn't use the network model unless you know what you are doing.
- *  Only the host model should be accessed because depending on the platform model, the network model can be NULL.
- */
-XBT_PUBLIC_DATA surf_network_model_t surf_network_model;
-
 /** \ingroup SURF_models
  *  \brief Same as network model 'LagrangeVelho', only with different correction factors.
  *
diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index 5c7a00e0ab..0717913fb2 100644
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -217,6 +217,11 @@ public:
 }
 }
 
+/** \ingroup SURF_models
+ *  \brief The network model
+ */
+XBT_PUBLIC_DATA simgrid::surf::NetworkModel* surf_network_model;
+
 #endif /* SURF_NETWORK_INTERFACE_HPP_ */