make all_existing_models visible from k:r:Model.hpp, which is public

diff --git a/include/simgrid/kernel/resource/Model.hpp b/include/simgrid/kernel/resource/Model.hpp
index 16e9a4f..27cd604 100644 (file)
--- a/include/simgrid/kernel/resource/Model.hpp
+++ b/include/simgrid/kernel/resource/Model.hpp
@@ -103,4 +103,10 @@ private:
 } // namespace resource
 } // namespace kernel
 } // namespace simgrid
 } // namespace resource
 } // namespace kernel
 } // namespace simgrid

+
+/** \ingroup SURF_models
+ *  \brief List of initialized models
+ */
+XBT_PUBLIC_DATA std::vector<simgrid::kernel::resource::Model*>* all_existing_models;
+

 #endif
 #endif

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index dd5152e..7a2b1a9 100644 (file)
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -5,6 +5,7 @@
 
 #include "simdag_private.hpp"
 #include "simgrid/kernel/resource/Action.hpp"
 
 #include "simdag_private.hpp"
 #include "simgrid/kernel/resource/Action.hpp"

+#include "simgrid/kernel/resource/Model.hpp"

 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/sg_config.hpp"
 #include "src/surf/surf_interface.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/sg_config.hpp"
 #include "src/surf/surf_interface.hpp"

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index a174a31..80d582f 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -63,9 +63,4 @@ int XBT_PRIVATE __surf_is_absolute_file_path(const char *file_path);
  * Action *
  **********/
 
  * Action *
  **********/
 

-/** \ingroup SURF_models
- *  \brief List of initialized models
- */
-XBT_PUBLIC_DATA std::vector<simgrid::kernel::resource::Model*>* all_existing_models;
-

 #endif /* SURF_MODEL_H_ */
 #endif /* SURF_MODEL_H_ */