From 01c1bf5558ed732f3d96b25c8ae25dbe83a3baf5 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 30 Jun 2018 01:12:50 +0200 Subject: [PATCH] Revert "please sonar and remove unused types" These types are used when simix.h is loaded from a C file. See eg https://ci.inria.fr/simgrid/job/SimGrid-Multi/5639/build_mode=Debug,node=simgrid-debian8-64-dynamic-analysis/console This reverts commit 83091276959030bb6b031127944400cdc71d214c. --- doc/doxygen/uhood_switch.doc | 1 + include/simgrid/forward.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/doc/doxygen/uhood_switch.doc b/doc/doxygen/uhood_switch.doc index b3bd850d6c..7247341ac1 100644 --- a/doc/doxygen/uhood_switch.doc +++ b/doc/doxygen/uhood_switch.doc @@ -629,6 +629,7 @@ which can be exposed using the same API as `std::condition_variable`: @code{cpp} class ConditionVariable { private: + friend s_smx_cond_t; smx_cond_t cond_; ConditionVariable(smx_cond_t cond) : cond_(cond) {} public: diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index 180b156aab..4ce7e57926 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -157,6 +157,10 @@ typedef struct kernel_Activity* smx_activity_t; typedef struct s_smx_context* smx_context_t; typedef struct s_smx_actor* smx_actor_t; +typedef struct s_smx_cond_t* smx_cond_t; +typedef struct s_smx_mutex* smx_mutex_t; +typedef struct s_smx_mailbox* smx_mailbox_t; +typedef struct s_surf_storage* surf_storage_t; #endif -- 2.20.1