X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fdynamic-array.h;h=a370774049bd680df09ccc2716b0ba38e401be8b;hb=3afa94aeca5a0daae40fd7b6cc96b7e4c150c7d8;hp=be27cc4958d51a2f2b42320044e371a0e664b492;hpb=a0377dfefe40662ba7d68617bce6ff467114136c;p=lttng-tools.git

diff --git a/src/common/dynamic-array.h b/src/common/dynamic-array.h
index be27cc495..a37077404 100644
--- a/src/common/dynamic-array.h
+++ b/src/common/dynamic-array.h
@@ -10,6 +10,10 @@
 
 #include <common/dynamic-buffer.h>
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 typedef void (*lttng_dynamic_array_element_destructor)(void *element);
 typedef void (*lttng_dynamic_pointer_array_destructor)(void *ptr);
 
@@ -28,7 +32,6 @@ struct lttng_dynamic_pointer_array {
  * Initialize a resizable array of fixed-size elements. This performs no
  * allocation and can't fail.
  */
-LTTNG_HIDDEN
 void lttng_dynamic_array_init(struct lttng_dynamic_array *array,
 		size_t element_size,
 		lttng_dynamic_array_element_destructor destructor);
@@ -70,7 +73,6 @@ void *lttng_dynamic_array_get_element(const struct lttng_dynamic_array *array,
  * NOTE: It is striclty _invalid_ to access memory after _size_, regardless
  *       of prior calls to set_capacity().
  */
-LTTNG_HIDDEN
 int lttng_dynamic_array_set_count(struct lttng_dynamic_array *array,
 		size_t new_element_count);
 
@@ -80,7 +82,6 @@ int lttng_dynamic_array_set_count(struct lttng_dynamic_array *array,
  *
  * element is a pointer to the element to add (copy) to the array.
  */
-LTTNG_HIDDEN
 int lttng_dynamic_array_add_element(struct lttng_dynamic_array *array,
 		const void *element);
 
@@ -89,16 +90,13 @@ int lttng_dynamic_array_add_element(struct lttng_dynamic_array *array,
  * decreased by one and the following elements are shifted to take its place
  * (when applicable).
  */
-LTTNG_HIDDEN
 int lttng_dynamic_array_remove_element(struct lttng_dynamic_array *array,
 		size_t element_index);
 
 /* Release any memory used by the dynamic array. */
-LTTNG_HIDDEN
 void lttng_dynamic_array_reset(struct lttng_dynamic_array *array);
 
 /* Remove all elements from the dynamic array. */
-LTTNG_HIDDEN
 void lttng_dynamic_array_clear(struct lttng_dynamic_array *array);
 
 /*
@@ -112,7 +110,6 @@ void lttng_dynamic_array_clear(struct lttng_dynamic_array *array);
  * Initialize a resizable array of fixed-size elements. This performs no
  * allocation and can't fail.
  */
-LTTNG_HIDDEN
 void lttng_dynamic_pointer_array_init(
 		struct lttng_dynamic_pointer_array *array,
 		lttng_dynamic_pointer_array_destructor destructor);
@@ -134,7 +131,7 @@ static inline
 void *lttng_dynamic_pointer_array_get_pointer(
 		const struct lttng_dynamic_pointer_array *array, size_t index)
 {
-	void **element = lttng_dynamic_array_get_element(&array->array, index);
+	void **element = (void **) lttng_dynamic_array_get_element(&array->array, index);
 
 	return *element;
 }
@@ -148,7 +145,7 @@ static inline
 void *lttng_dynamic_pointer_array_steal_pointer(
 		struct lttng_dynamic_pointer_array *array, size_t index)
 {
-	void **p_element = lttng_dynamic_array_get_element(&array->array, index);
+	void **p_element = (void **) lttng_dynamic_array_get_element(&array->array, index);
 	void *element = *p_element;
 
 	*p_element = NULL;
@@ -173,18 +170,19 @@ int lttng_dynamic_pointer_array_add_pointer(
  * count is decreased by one and the following pointers are shifted to
  * take the place of the removed pointer (if applicable).
  */
-LTTNG_HIDDEN
 int lttng_dynamic_pointer_array_remove_pointer(
 		struct lttng_dynamic_pointer_array *array, size_t index);
 
 /* Release any memory used by the dynamic array. */
-LTTNG_HIDDEN
 void lttng_dynamic_pointer_array_reset(
 		struct lttng_dynamic_pointer_array *array);
 
 /* Remove all elements from the dynamic pointer array. */
-LTTNG_HIDDEN
 void lttng_dynamic_pointer_array_clear(
 		struct lttng_dynamic_pointer_array *array);
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif /* LTTNG_DYNAMIC_ARRAY_H */