summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp
diff options
context:
space:
mode:
authorBilly Robert O'Neal III <bion@microsoft.com>2018-10-20 03:35:45 +0000
committerBilly Robert O'Neal III <bion@microsoft.com>2018-10-20 03:35:45 +0000
commit95cf9fa2137631543999cbaaef9381e6be4ac97b (patch)
treeeb55198ec17b2fa9794bff8859a841b59d7ec89c /libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp
parent6b13e89ab8035900f1103610812b02b0aff5c40e (diff)
downloadbcm5719-llvm-95cf9fa2137631543999cbaaef9381e6be4ac97b.tar.gz
bcm5719-llvm-95cf9fa2137631543999cbaaef9381e6be4ac97b.zip
[libcxx] [test] Don't detect Windows' UCRT with TEST_COMPILER_C1XX
The test is trying to avoid saying aligned_alloc on Windows' UCRT, which does not (and can not) implement aligned_alloc. However, it's testing for c1xx, meaning clang on Windows will fail this test when using the UCRT. llvm-svn: 344829
Diffstat (limited to 'libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp')
-rw-r--r--libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp b/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp
index e9dda6cee4e..02c8c9fd8bb 100644
--- a/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp
+++ b/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp
@@ -75,10 +75,8 @@ int main()
static_assert((std::is_same<decltype(std::srand(0)), void>::value), "");
// Microsoft does not implement aligned_alloc in their C library
-#ifndef TEST_COMPILER_C1XX
-#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES)
- static_assert((std::is_same<decltype(std::aligned_alloc(0,0)), void*>::value), "");
-#endif
+#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES) && !defined(_WIN32)
+ static_assert((std::is_same<decltype(aligned_alloc(0,0)), void*>::value), "");
#endif
static_assert((std::is_same<decltype(std::calloc(0,0)), void*>::value), "");
OpenPOWER on IntegriCloud