From 7b7e55c6a85436c8e77b2635a3146898c3094f81 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 25 May 2018 01:51:55 +0200 Subject: [PATCH] make all_existing_models visible from k:r:Model.hpp, which is public --- include/simgrid/kernel/resource/Model.hpp | 6 ++++++ src/simdag/sd_global.cpp | 1 + src/surf/surf_interface.hpp | 5 ----- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/simgrid/kernel/resource/Model.hpp b/include/simgrid/kernel/resource/Model.hpp index 16e9a4fb60..27cd6045ee 100644 --- 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 + +/** \ingroup SURF_models + * \brief List of initialized models + */ +XBT_PUBLIC_DATA std::vector* all_existing_models; + #endif diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp index dd5152ea84..7a2b1a9348 100644 --- 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 "simgrid/kernel/resource/Model.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 a174a31062..80d582f5d7 100644 --- 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 * **********/ -/** \ingroup SURF_models - * \brief List of initialized models - */ -XBT_PUBLIC_DATA std::vector* all_existing_models; - #endif /* SURF_MODEL_H_ */ -- 2.20.1