memcpy(dst, elm, dynar->elmsize);
}
-extern "C" void xbt_dynar_dump(xbt_dynar_t dynar)
+void xbt_dynar_dump(xbt_dynar_t dynar)
{
XBT_INFO("Dynar dump: size=%lu; used=%lu; elmsize=%lu; data=%p; free_f=%p",
dynar->size, dynar->used, dynar->elmsize, dynar->data, dynar->free_f);
* Creates a new dynar. If a free_func is provided, the elements have to be pointer of pointer. That is to say that
* dynars can contain either base types (int, char, double, etc) or pointer of pointers (struct **).
*/
-extern "C" xbt_dynar_t xbt_dynar_new(const unsigned long elmsize, void_f_pvoid_t const free_f)
+xbt_dynar_t xbt_dynar_new(const unsigned long elmsize, void_f_pvoid_t const free_f)
{
xbt_dynar_t dynar = xbt_new0(s_xbt_dynar_t, 1);
/** @brief Initialize a dynar structure that was not malloc'ed
* This can be useful to keep temporary dynars on the stack
*/
-extern "C" void xbt_dynar_init(xbt_dynar_t dynar, const unsigned long elmsize, void_f_pvoid_t const free_f)
+void xbt_dynar_init(xbt_dynar_t dynar, const unsigned long elmsize, void_f_pvoid_t const free_f)
{
dynar->size = 0;
dynar->used = 0;
}
/** @brief Destroy a dynar that was created with xbt_dynar_init */
-extern "C" void xbt_dynar_free_data(xbt_dynar_t dynar)
+void xbt_dynar_free_data(xbt_dynar_t dynar)
{
xbt_dynar_reset(dynar);
if (dynar)
* kilkil a dynar BUT NOT its content. Ie, the array is freed, but the content is not touched (the \a free_f function
* is not used)
*/
-extern "C" void xbt_dynar_free_container(xbt_dynar_t* dynar)
+void xbt_dynar_free_container(xbt_dynar_t* dynar)
{
if (dynar && *dynar) {
xbt_dynar_t d = *dynar;
*
* \param dynar who to squeeze
*/
-extern "C" void xbt_dynar_reset(xbt_dynar_t const dynar)
+void xbt_dynar_reset(xbt_dynar_t const dynar)
{
_sanity_check_dynar(dynar);
* \param d1 dynar to keep
* \param d2 dynar to merge into d1. This dynar is free at end.
*/
-extern "C" void xbt_dynar_merge(xbt_dynar_t* d1, xbt_dynar_t* d2)
+void xbt_dynar_merge(xbt_dynar_t* d1, xbt_dynar_t* d2)
{
if((*d1)->elmsize != (*d2)->elmsize)
xbt_die("Element size must are not equal");
* Set \a empty_slots_wanted to zero to reduce the dynar internal array as much as possible.
* Note that if \a empty_slots_wanted is greater than the array size, the internal array is expanded instead of shrunk.
*/
-extern "C" void xbt_dynar_shrink(xbt_dynar_t dynar, int empty_slots_wanted)
+void xbt_dynar_shrink(xbt_dynar_t dynar, int empty_slots_wanted)
{
_xbt_dynar_resize(dynar, dynar->used + empty_slots_wanted);
}
*
* kilkil a dynar and its content
*/
-extern "C" void xbt_dynar_free(xbt_dynar_t* dynar)
+void xbt_dynar_free(xbt_dynar_t* dynar)
{
if (dynar && *dynar) {
xbt_dynar_reset(*dynar);
}
/** \brief free a dynar passed as void* (handy to store dynar in dynars or dict) */
-extern "C" void xbt_dynar_free_voidp(void* d)
+void xbt_dynar_free_voidp(void* d)
{
xbt_dynar_t dynar = (xbt_dynar_t)d;
xbt_dynar_free(&dynar);
*
* \param dynar the dynar we want to mesure
*/
-extern "C" unsigned long xbt_dynar_length(const xbt_dynar_t dynar)
+unsigned long xbt_dynar_length(const xbt_dynar_t dynar)
{
return (dynar ? (unsigned long) dynar->used : (unsigned long) 0);
}
*
*\param dynar the dynat we want to check
*/
-extern "C" int xbt_dynar_is_empty(const xbt_dynar_t dynar)
+int xbt_dynar_is_empty(const xbt_dynar_t dynar)
{
return (xbt_dynar_length(dynar) == 0);
}
* \param idx index of the slot we want to retrieve
* \param[out] dst where to put the result to.
*/
-extern "C" void xbt_dynar_get_cpy(const xbt_dynar_t dynar, const unsigned long idx, void* const dst)
+void xbt_dynar_get_cpy(const xbt_dynar_t dynar, const unsigned long idx, void* const dst)
{
_sanity_check_dynar(dynar);
_check_inbound_idx(dynar, idx);
* \warning The returned value is the actual content of the dynar.
* Make a copy before fooling with it.
*/
-extern "C" void* xbt_dynar_get_ptr(const xbt_dynar_t dynar, const unsigned long idx)
+void* xbt_dynar_get_ptr(const xbt_dynar_t dynar, const unsigned long idx)
{
void *res;
_sanity_check_dynar(dynar);
return res;
}
-extern "C" void* xbt_dynar_set_at_ptr(const xbt_dynar_t dynar, const unsigned long idx)
+void* xbt_dynar_set_at_ptr(const xbt_dynar_t dynar, const unsigned long idx)
{
_sanity_check_dynar(dynar);
*
* If you want to free the previous content, use xbt_dynar_replace().
*/
-extern "C" void xbt_dynar_set(xbt_dynar_t dynar, const int idx, const void* const src)
+void xbt_dynar_set(xbt_dynar_t dynar, const int idx, const void* const src)
{
memcpy(xbt_dynar_set_at_ptr(dynar, idx), src, dynar->elmsize);
}
* Set the Nth element of a dynar, expanding the dynar if needed, AND DO free the previous value at this position. If
* you don't want to free the previous content, use xbt_dynar_set().
*/
-extern "C" void xbt_dynar_replace(xbt_dynar_t dynar, const unsigned long idx, const void* const object)
+void xbt_dynar_replace(xbt_dynar_t dynar, const unsigned long idx, const void* const object)
{
_sanity_check_dynar(dynar);
* You can then use regular affectation to set its value instead of relying on the slow memcpy. This is what
* xbt_dynar_insert_at_as() does.
*/
-extern "C" void* xbt_dynar_insert_at_ptr(xbt_dynar_t const dynar, const int idx)
+void* xbt_dynar_insert_at_ptr(xbt_dynar_t const dynar, const int idx)
{
void *res;
unsigned long old_used;
* Set the Nth element of a dynar, expanding the dynar if needed, and moving the previously existing value and all
* subsequent ones to one position right in the dynar.
*/
-extern "C" void xbt_dynar_insert_at(xbt_dynar_t const dynar, const int idx, const void* const src)
+void xbt_dynar_insert_at(xbt_dynar_t const dynar, const int idx, const void* const src)
{
/* checks done in xbt_dynar_insert_at_ptr */
memcpy(xbt_dynar_insert_at_ptr(dynar, idx), src, dynar->elmsize);
* If the object argument of this function is a non-null pointer, the removed element is copied to this address. If not,
* the element is freed using the free_f function passed at dynar creation.
*/
-extern "C" void xbt_dynar_remove_at(xbt_dynar_t const dynar, const int idx, void* const object)
+void xbt_dynar_remove_at(xbt_dynar_t const dynar, const int idx, void* const object)
{
_sanity_check_dynar(dynar);
_check_inbound_idx(dynar, idx);
*
* Each of the removed elements is freed using the free_f function passed at dynar creation.
*/
-extern "C" void xbt_dynar_remove_n_at(xbt_dynar_t const dynar, const unsigned int n, const int idx)
+void xbt_dynar_remove_n_at(xbt_dynar_t const dynar, const unsigned int n, const int idx)
{
if (not n)
return;
* Raises not_found_error if not found. If you have less than 2 millions elements, you probably want to use
* #xbt_dynar_search_or_negative() instead, so that you don't have to TRY/CATCH on element not found.
*/
-extern "C" unsigned int xbt_dynar_search(xbt_dynar_t const dynar, void* const elem)
+unsigned int xbt_dynar_search(xbt_dynar_t const dynar, void* const elem)
{
unsigned long it;
* Note that usually, the dynar indices are unsigned integers. If you have more than 2 million elements in your dynar,
* this very function will not work (but the other will).
*/
-extern "C" signed int xbt_dynar_search_or_negative(xbt_dynar_t const dynar, void* const elem)
+signed int xbt_dynar_search_or_negative(xbt_dynar_t const dynar, void* const elem)
{
unsigned long it;
* Beware that if your dynar contains pointed values (such as strings) instead of scalar, this function is probably not
* what you want. Check the documentation of xbt_dynar_search() for more info.
*/
-extern "C" int xbt_dynar_member(xbt_dynar_t const dynar, void* const elem)
+int xbt_dynar_member(xbt_dynar_t const dynar, void* const elem)
{
unsigned long it;
* You can then use regular affectation to set its value instead of relying on the slow memcpy. This is what
* xbt_dynar_push_as() does.
*/
-extern "C" void* xbt_dynar_push_ptr(xbt_dynar_t const dynar)
+void* xbt_dynar_push_ptr(xbt_dynar_t const dynar)
{
return xbt_dynar_insert_at_ptr(dynar, dynar->used);
}
/** @brief Add an element at the end of the dynar */
-extern "C" void xbt_dynar_push(xbt_dynar_t const dynar, const void* const src)
+void xbt_dynar_push(xbt_dynar_t const dynar, const void* const src)
{
/* checks done in xbt_dynar_insert_at_ptr */
memcpy(xbt_dynar_insert_at_ptr(dynar, dynar->used), src, dynar->elmsize);
* You can then use regular affectation to set its value instead of relying on the slow memcpy. This is what
* xbt_dynar_pop_as() does.
*/
-extern "C" void* xbt_dynar_pop_ptr(xbt_dynar_t const dynar)
+void* xbt_dynar_pop_ptr(xbt_dynar_t const dynar)
{
_check_populated_dynar(dynar);
XBT_CDEBUG(xbt_dyn, "Pop %p", (void *) dynar);
}
/** @brief Get and remove the last element of the dynar */
-extern "C" void xbt_dynar_pop(xbt_dynar_t const dynar, void* const dst)
+void xbt_dynar_pop(xbt_dynar_t const dynar, void* const dst)
{
/* sanity checks done by remove_at */
XBT_CDEBUG(xbt_dyn, "Pop %p", (void *) dynar);
*
* This is less efficient than xbt_dynar_push()
*/
-extern "C" void xbt_dynar_unshift(xbt_dynar_t const dynar, const void* const src)
+void xbt_dynar_unshift(xbt_dynar_t const dynar, const void* const src)
{
/* sanity checks done by insert_at */
xbt_dynar_insert_at(dynar, 0, src);
*
* This is less efficient than xbt_dynar_pop()
*/
-extern "C" void xbt_dynar_shift(xbt_dynar_t const dynar, void* const dst)
+void xbt_dynar_shift(xbt_dynar_t const dynar, void* const dst)
{
/* sanity checks done by remove_at */
xbt_dynar_remove_at(dynar, 0, dst);
*
* The mapped function may change the value of the element itself, but should not mess with the structure of the dynar.
*/
-extern "C" void xbt_dynar_map(const xbt_dynar_t dynar, void_f_pvoid_t const op)
+void xbt_dynar_map(const xbt_dynar_t dynar, void_f_pvoid_t const op)
{
char *const data = (char *) dynar->data;
const unsigned long elmsize = dynar->elmsize;
*
* This function can be used while traversing without problem.
*/
-extern "C" void xbt_dynar_cursor_rm(xbt_dynar_t dynar, unsigned int* const cursor)
+void xbt_dynar_cursor_rm(xbt_dynar_t dynar, unsigned int* const cursor)
{
xbt_dynar_remove_at(dynar, *cursor, nullptr);
*cursor -= 1;
* \param dynar the dynar to sort
* \param compar_fn comparison function of type (int (compar_fn*) (const void*) (const void*)).
*/
-extern "C" void xbt_dynar_sort(xbt_dynar_t dynar, int_f_cpvoid_cpvoid_t compar_fn)
+void xbt_dynar_sort(xbt_dynar_t dynar, int_f_cpvoid_cpvoid_t compar_fn)
{
if (dynar->data != nullptr)
qsort(dynar->data, dynar->used, dynar->elmsize, compar_fn);
}
/** @brief Sorts a dynar of strings (ie, char* data) */
-extern "C" xbt_dynar_t xbt_dynar_sort_strings(xbt_dynar_t dynar)
+xbt_dynar_t xbt_dynar_sort_strings(xbt_dynar_t dynar)
{
xbt_dynar_sort(dynar, strcmp_voidp);
return dynar; // to enable functional uses
*
* Note: The dynar won't be usable afterwards.
*/
-extern "C" void* xbt_dynar_to_array(xbt_dynar_t dynar)
+void* xbt_dynar_to_array(xbt_dynar_t dynar)
{
void *res;
xbt_dynar_shrink(dynar, 1);
* considered equal, and a value different of zero when they are considered different. Finally, d2 is destroyed
* afterwards.
*/
-extern "C" int xbt_dynar_compare(xbt_dynar_t d1, xbt_dynar_t d2, int (*compar)(const void*, const void*))
+int xbt_dynar_compare(xbt_dynar_t d1, xbt_dynar_t d2, int (*compar)(const void*, const void*))
{
int i ;
int size;
