From 7a0dc1a9e77d023871e166c9d2aecf9133ddf043 Mon Sep 17 00:00:00 2001 From: zoecarver Date: Wed, 8 Apr 2020 09:40:33 -0700 Subject: [PATCH] [libc++] Remove std::optional from ObjC is_scalar test. std::optional requires C++17. Instead of only running the test above C++14, this commit removes uses of std::optional from the test (it's already tested in block.objc.pass.mm). --- libcxx/test/libcxx/type_traits/is_scalar.objc.pass.mm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libcxx/test/libcxx/type_traits/is_scalar.objc.pass.mm b/libcxx/test/libcxx/type_traits/is_scalar.objc.pass.mm index dc7fdf1..65b14fb 100644 --- a/libcxx/test/libcxx/type_traits/is_scalar.objc.pass.mm +++ b/libcxx/test/libcxx/type_traits/is_scalar.objc.pass.mm @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: c++98, c++03, c++11, c++14 +// UNSUPPORTED: c++98, c++03 // REQUIRES: has-fblocks // ADDITIONAL_COMPILE_FLAGS: -fblocks @@ -17,7 +17,6 @@ // Make sure we report that blocks are scalar types. #include -#include struct Foo { }; template struct Arg { }; @@ -35,8 +34,5 @@ static_assert(std::is_scalar, Arg<1>, Arg<2>)>::value, ""); int main(int, char**) { - // Make sure that std::optional can be used with a block, which is the - // underlying motivation for making blocks satisfy std::is_scalar. - std::optional)> opt; (void)opt; return 0; } -- 2.7.4