[libcxx-commits] [libcxx] 38e0720 - [libc++] Mark is_scalar test as unsupported in C++11 and C++14

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-04-06T11:23:36-04:00
New Revision: 38e07204749bf94ffe9888196108dc5c77d439b0

URL: https://github.com/llvm/llvm-project/commit/38e07204749bf94ffe9888196108dc5c77d439b0
DIFF: https://github.com/llvm/llvm-project/commit/38e07204749bf94ffe9888196108dc5c77d439b0.diff

LOG: [libc++] Mark is_scalar test as unsupported in C++11 and C++14

That test requires std::optional. We never noticed that because our
test format was skipping Objective-C++ tests altogether.

Added: 
    

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

Removed: 
    


################################################################################
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 23693fc064eb..dc7fdf1ee8f3 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
+// UNSUPPORTED: c++98, c++03, c++11, c++14
 // REQUIRES: has-fblocks
 // ADDITIONAL_COMPILE_FLAGS: -fblocks
 
@@ -35,6 +35,8 @@
 
 
 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;
 }