From 243e20d51e1636225033073ffd76d73fbd366ef7 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 20 Nov 2016 18:27:46 +0100 Subject: [PATCH] avoid using C exceptions as valgrind don't like them too much --- src/xbt/dynar.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/xbt/dynar.cpp b/src/xbt/dynar.cpp index a78bdefa43..0ceb8cc948 100644 --- a/src/xbt/dynar.cpp +++ b/src/xbt/dynar.cpp @@ -461,15 +461,14 @@ signed int xbt_dynar_search_or_negative(xbt_dynar_t const dynar, void *const ele */ int xbt_dynar_member(xbt_dynar_t const dynar, void *const elem) { - try { - xbt_dynar_search(dynar, elem); - } - catch (xbt_ex& e) { - if (e.category == not_found_error) - return 0; - throw; - } - return 1; + unsigned long it; + + for (it = 0; it < dynar->used; it++) + if (!memcmp(_xbt_dynar_elm(dynar, it), elem, dynar->elmsize)) { + return 1; + } + + return 0; } /** @brief Make room at the end of the dynar for a new element, and return a pointer to it. -- 2.20.1