Remove unused type definitions.

[simgrid.git] / include / xbt / synchro.h

diff --git a/include/xbt/synchro.h b/include/xbt/synchro.h
index a03505a..96d7556 100644 (file)
--- a/include/xbt/synchro.h
+++ b/include/xbt/synchro.h
@@ -1,6 +1,6 @@
 /* xbt/synchro.h -- Simulated synchronization                               */
 
-/* Copyright (c) 2009-2018. The SimGrid Team.                               */
+/* Copyright (c) 2009-2019. The SimGrid Team.                               */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -8,6 +8,7 @@
 #ifndef XBT_THREAD_H
 #define XBT_THREAD_H
 
+#include "simgrid/forward.h"
 #include <xbt/function_types.h>
 #include <xbt/misc.h> /* SG_BEGIN_DECL */
 
@@ -26,7 +27,11 @@ SG_BEGIN_DECL()
 /** @brief Thread mutex data type (opaque object)
  *  @hideinitializer
  */
+#ifdef __cplusplus
+typedef simgrid::kernel::activity::MutexImpl* xbt_mutex_t;
+#else
 typedef struct s_smx_mutex_* xbt_mutex_t;
+#endif
 
 /** @brief Creates a new mutex variable */
 XBT_PUBLIC xbt_mutex_t xbt_mutex_init(void);
@@ -37,8 +42,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 +56,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);