From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Wed, 6 Mar 2019 21:06:24 +0000 (+0100)
Subject: Sometimes 'free' is not a member of 'std'.
X-Git-Tag: v3_22~155
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2eade77f4364f7c8aa5cc2542f00784cc677f01f

Sometimes 'free' is not a member of 'std'.
---

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index 7cdf659412..45d9320da1 100644
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -111,7 +111,7 @@ static XBT_ALWAYS_INLINE void *xbt_realloc(void *p, size_t s) {
 #define xbt_free(p) free(p) /*nothing specific to do here. A poor valgrind replacement? */
 
 #ifdef __cplusplus
-#define XBT_FREE_NOEXCEPT noexcept(noexcept(std::free))
+#define XBT_FREE_NOEXCEPT noexcept(noexcept(::free))
 #else
 #define XBT_FREE_NOEXCEPT
 #endif
diff --git a/src/xbt/xbt_main.cpp b/src/xbt/xbt_main.cpp
index 4129fc1846..5fe38453b0 100644
--- a/src/xbt/xbt_main.cpp
+++ b/src/xbt/xbt_main.cpp
@@ -135,13 +135,13 @@ void xbt_init(int *argc, char **argv)
 
 /* these two functions belong to xbt/sysdep.h, which have no corresponding .c file */
 /** @brief like xbt_free, but you can be sure that it is a function  */
-void xbt_free_f(void* p) noexcept(noexcept(std::free))
+void xbt_free_f(void* p) noexcept(noexcept(::free))
 {
   xbt_free(p);
 }
 
 /** @brief should be given a pointer to pointer, and frees the second one */
-void xbt_free_ref(void* d) noexcept(noexcept(std::free))
+void xbt_free_ref(void* d) noexcept(noexcept(::free))
 {
   xbt_free(*(void**)d);
 }