Skip to content

Commit 562b6fa

Browse files
committed
Fix check
1 parent 03f3fe2 commit 562b6fa

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

libcxx/test/support/count_new.h

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,12 +455,21 @@ void operator delete[](void* p, std::nothrow_t const&) TEST_NOEXCEPT {
455455
# define USE_ALIGNED_ALLOC
456456
# endif
457457

458+
# if defined(__APPLE__)
459+
# if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \
460+
__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101500)
461+
# define TEST_HAS_NO_C11_ALIGNED_ALLOC
462+
# endif
463+
# elif defined(__ANDROID__) && __ANDROID_API__ < 28
464+
# define TEST_HAS_NO_C11_ALIGNED_ALLOC
465+
# endif
466+
458467
inline void* allocate_aligned_impl(std::size_t size, std::align_val_t align) {
459468
const std::size_t alignment = static_cast<std::size_t>(align);
460469
void* ret = nullptr;
461470
# ifdef USE_ALIGNED_ALLOC
462471
ret = _aligned_malloc(size, alignment);
463-
# elif TEST_STD_VER >= 17
472+
# elif TEST_STD_VER >= 17 && !defined(TEST_HAS_NO_C11_ALIGNED_ALLOC)
464473
size_t rounded_size = (size + alignment - 1) & ~(alignment - 1);
465474
ret = aligned_alloc(alignment, size > rounded_size ? size : rounded_size);
466475
# else

0 commit comments

Comments
 (0)