From 01f627a4d75ae25850bc29df74112696da571326 Mon Sep 17 00:00:00 2001 From: Arseny Kapoulkine Date: Tue, 12 May 2015 21:49:44 -0700 Subject: tests: Fix address sanitizer detection for GCC --- tests/allocator.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'tests/allocator.cpp') diff --git a/tests/allocator.cpp b/tests/allocator.cpp index a2bcb48..e5c634c 100644 --- a/tests/allocator.cpp +++ b/tests/allocator.cpp @@ -4,6 +4,13 @@ #include #include +// Address sanitizer +#if defined(__has_feature) +# define ADDRESS_SANITIZER __has_feature(address_sanitizer) +#else +# define ADDRESS_SANITIZER defined(__SANITIZE_ADDRESS__) +#endif + // Low-level allocation functions #if defined(_WIN32) || defined(_WIN64) # ifdef __MWERKS__ @@ -67,7 +74,7 @@ namespace VirtualProtect(rptr, aligned_size + page_size, PAGE_NOACCESS, &old_flags); } } -#elif (defined(__APPLE__) || defined(__linux__)) && !((defined(__has_feature) && __has_feature(address_sanitizer)) || defined(__SANITIZE_ADDRESS__)) +#elif (defined(__APPLE__) || defined(__linux__)) && !ADDRESS_SANITIZER # include namespace -- cgit v1.2.3