summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/utilities/optional
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2017-01-24 18:03:32 +0000
committerMarshall Clow <mclow.lists@gmail.com>2017-01-24 18:03:32 +0000
commit77dd30b5572ccccf00f49221a47f9ecf84c951ac (patch)
treeb6bda1a1e5bbfdadee81d54d41bb39710eed2267 /libcxx/test/std/utilities/optional
parentd90f5f6698557d5d3799e710e5c7b38321f255f3 (diff)
downloadbcm5719-llvm-77dd30b5572ccccf00f49221a47f9ecf84c951ac.tar.gz
bcm5719-llvm-77dd30b5572ccccf00f49221a47f9ecf84c951ac.zip
Mark LWG2736 as complete. No code changes, but we have more tests now
llvm-svn: 292958
Diffstat (limited to 'libcxx/test/std/utilities/optional')
-rw-r--r--libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.fail.cpp27
-rw-r--r--libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.pass.cpp11
2 files changed, 35 insertions, 3 deletions
diff --git a/libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.fail.cpp b/libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.fail.cpp
new file mode 100644
index 00000000000..fa7d0a6b2a5
--- /dev/null
+++ b/libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.fail.cpp
@@ -0,0 +1,27 @@
+//===----------------------------------------------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++98, c++03, c++11, c++14
+// <optional>
+
+// struct nullopt_t{see below};
+// constexpr nullopt_t nullopt(unspecified);
+
+// [optional.nullopt]/2:
+// Type nullopt_t shall not have a default constructor or an initializer-list constructor.
+// It shall not be an aggregate and shall be a literal type.
+// Constant nullopt shall be initialized with an argument of literal type.
+
+#include <optional>
+#include "test_macros.h"
+
+int main()
+{
+ std::nullopt_t n = {};
+}
diff --git a/libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.pass.cpp b/libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.pass.cpp
index 84bb29fabac..14a040cea97 100644
--- a/libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.pass.cpp
@@ -13,6 +13,11 @@
// struct nullopt_t{see below};
// constexpr nullopt_t nullopt(unspecified);
+// [optional.nullopt]/2:
+// Type nullopt_t shall not have a default constructor or an initializer-list constructor.
+// It shall not be an aggregate and shall be a literal type.
+// Constant nullopt shall be initialized with an argument of literal type.
+
#include <optional>
#include <type_traits>
@@ -29,9 +34,9 @@ test(const nullopt_t&)
int main()
{
- static_assert((std::is_class<nullopt_t>::value), "");
- static_assert((std::is_empty<nullopt_t>::value), "");
- static_assert((std::is_literal_type<nullopt_t>::value), "");
+ static_assert(( std::is_class<nullopt_t>::value), "");
+ static_assert(( std::is_empty<nullopt_t>::value), "");
+ static_assert(( std::is_literal_type<nullopt_t>::value), "");
static_assert((!std::is_default_constructible<nullopt_t>::value), "");
static_assert(test(nullopt) == 3, "");
OpenPOWER on IntegriCloud