Author: marshall
Date: Thu May 24 19:08:49 2018
New Revision: 333251
URL: http://llvm.org/viewvc/llvm-project?rev=333251&view=rev
Log:
Add deduction guides for optional
Added:
libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp
libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp
Modified:
libcxx/trunk/include/optional
Modified: libcxx/trunk/include/optional
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/optional?rev=333251&r1=333250&r2=333251&view=diff
==============================================================================
--- libcxx/trunk/include/optional (original)
+++ libcxx/trunk/include/optional Thu May 24 19:08:49 2018
@@ -139,6 +139,10 @@ namespace std {
private:
T *val; // exposition only
};
+
+template<class T>
+ optional(T) -> optional<T>;
+
} // namespace std
*/
@@ -1003,6 +1007,11 @@ private:
}
};
+#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES
+template<class T>
+ optional(T) -> optional<T>;
+#endif
+
// Comparisons between optionals
template <class _Tp, class _Up>
_LIBCPP_INLINE_VISIBILITY constexpr
Added:
libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp?rev=333251&view=auto
==============================================================================
---
libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp
(added)
+++
libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp
Thu May 24 19:08:49 2018
@@ -0,0 +1,38 @@
+//===----------------------------------------------------------------------===//
+//
+// 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.
+//
+//===----------------------------------------------------------------------===//
+
+// <optional>
+// UNSUPPORTED: c++98, c++03, c++11, c++14
+// UNSUPPORTED: libcpp-no-deduction-guides
+
+
+// template<class T>
+// optional(T) -> optional<T>;
+
+
+#include <optional>
+#include <cassert>
+
+struct A {};
+
+int main()
+{
+// Test the explicit deduction guides
+
+// Test the implicit deduction guides
+ {
+// optional()
+ std::optional opt; // expected-error {{no viable constructor or
deduction guide for deduction of template arguments of 'optional'}}
+ }
+
+ {
+// optional(nullopt_t)
+ std::optional opt(std::nullopt); // expected-error-re@optional:*
{{static_assert failed{{.*}} "instantiation of optional with nullopt_t is
ill-formed"}}
+ }
+}
Added:
libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp?rev=333251&view=auto
==============================================================================
---
libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp
(added)
+++
libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp
Thu May 24 19:08:49 2018
@@ -0,0 +1,44 @@
+//===----------------------------------------------------------------------===//
+//
+// 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.
+//
+//===----------------------------------------------------------------------===//
+
+// <optional>
+// UNSUPPORTED: c++98, c++03, c++11, c++14
+// UNSUPPORTED: libcpp-no-deduction-guides
+
+
+// template<class T>
+// optional(T) -> optional<T>;
+
+
+#include <optional>
+#include <cassert>
+
+struct A {};
+
+int main()
+{
+// Test the explicit deduction guides
+ {
+// optional(T)
+ std::optional opt(5);
+ static_assert(std::is_same_v<decltype(opt), std::optional<int>>, "");
+ assert(static_cast<bool>(opt));
+ assert(*opt == 5);
+ }
+
+ {
+// optional(T)
+ std::optional opt(A{});
+ static_assert(std::is_same_v<decltype(opt), std::optional<A>>, "");
+ assert(static_cast<bool>(opt));
+ }
+
+// Test the implicit deduction guides
+
+}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
