[libcxx-commits] [PATCH] D77563: [libc++] Move C++17 check around optional only in ObjC is_scalar test.

[Zoe Carver via Phabricator via libcxx-commits]

zoecarver updated this revision to Diff 255414.
zoecarver added a comment.

- Merge branch 'master' into fix/objc-is-scalar


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D77563/new/

https://reviews.llvm.org/D77563

Files:
  libcxx/test/libcxx/type_traits/is_scalar.objc.pass.mm


Index: libcxx/test/libcxx/type_traits/is_scalar.objc.pass.mm
===================================================================
--- libcxx/test/libcxx/type_traits/is_scalar.objc.pass.mm
+++ 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 <type_traits>
-#include <optional>
 
 struct Foo { };
 template <int> struct Arg { };
@@ -35,8 +34,5 @@
 
 
 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<Foo (^)(Arg<0>)> opt; (void)opt;
     return 0;
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D77563.255414.patch
Type: text/x-patch
Size: 925 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20200406/4b8675b8/attachment.bin>