X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a3a100990355eb757dc81106b5aac6daed0b8e1..717bb82fd56727b8a066418eaa654290373736ea:/include/xbt/synchro.h

diff --git a/include/xbt/synchro.h b/include/xbt/synchro.h
index 3a990f18e9..a4923d257f 100644
--- a/include/xbt/synchro.h
+++ b/include/xbt/synchro.h
@@ -8,8 +8,9 @@
 #ifndef XBT_THREAD_H
 #define XBT_THREAD_H
 
-#include "xbt/function_types.h"
-#include "xbt/misc.h" /* SG_BEGIN_DECL */
+#include "simgrid/forward.h"
+#include <xbt/function_types.h>
+#include <xbt/misc.h> /* SG_BEGIN_DECL */
 
 SG_BEGIN_DECL()
 
@@ -37,8 +38,8 @@ XBT_PUBLIC void xbt_mutex_acquire(xbt_mutex_t mutex);
 /** @brief Tries to block onto the given mutex variable
  * Tries to lock a mutex, return 1 if the mutex is unlocked, else 0.
  * This function does not block and wait for the mutex to be unlocked.
- * \param mutex The mutex
- * \return 1 - mutex free, 0 - mutex used
+ * @param mutex The mutex
+ * @return 1 - mutex free, 0 - mutex used
  */
 XBT_PUBLIC int xbt_mutex_try_acquire(xbt_mutex_t mutex);
 
@@ -51,7 +52,11 @@ XBT_PUBLIC void xbt_mutex_destroy(xbt_mutex_t mutex);
 /** @brief Thread condition data type (opaque object)
  *  @hideinitializer
  */
+#ifdef __cplusplus
+typedef simgrid::kernel::activity::ConditionVariableImpl* xbt_cond_t;
+#else
 typedef struct s_smx_cond_* xbt_cond_t;
+#endif
 
 /** @brief Creates a condition variable */
 XBT_PUBLIC xbt_cond_t xbt_cond_init(void);