mirror of
https://github.com/llvm-mirror/libcxx.git
synced 2025-10-24 03:32:35 +08:00
35ce4859dd
Summary: Adapt implementation of Library Fundamentals TS optional into an implementation of N4606 optional. - Update relational operators per http://wg21.link/P0307 - Update to requirements of http://wg21.link/P0032 - Extension: Implement trivial copy/move construction/assignment for `optional<T>` when `T` is trivially copyable. Audit P/Rs for optional LWG issues: - 2756 "C++ WP optional<T> should 'forward' T's implicit conversions" Implemented, which also resolves 2753 "Optional's constructors and assignments need constraints" (modulo my refusal to explicitly delete the move operations, which is a design error that I'm working on correcting in the 2756 P/R). - 2736 "nullopt_t insufficiently constrained" Already conforming. I've added a test ensuring that `nullopt_t` is not copy-initializable from an empty braced-init-list, which I believe is the root intent of the issue, to avoid regression. - 2740 "constexpr optional<T>::operator->" Already conforming. - 2746 "Inconsistency between requirements for emplace between optional and variant" No P/R, but note that the author's '"suggested resolution" is already implemented. - 2748 "swappable traits for optionals" Already conforming. - 2753 "Optional's constructors and assignments need constraints" Implemented. Most of the work for this patch was done by Casey Carter @ Microsoft. Thank you Casey! Reviewers: mclow.lists, CaseyCarter, EricWF Differential Revision: https://reviews.llvm.org/D22741 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@283980 91177308-0d34-0410-b5e6-96231b3b80d8
69 lines
1.4 KiB
C++
69 lines
1.4 KiB
C++
//===----------------------------------------------------------------------===//
|
|
//
|
|
// 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>
|
|
|
|
// template <class U> T optional<T>::value_or(U&& v) &&;
|
|
|
|
#include <optional>
|
|
#include <type_traits>
|
|
#include <cassert>
|
|
|
|
#include "test_macros.h"
|
|
|
|
using std::optional;
|
|
using std::in_place_t;
|
|
using std::in_place;
|
|
|
|
struct Y
|
|
{
|
|
int i_;
|
|
|
|
Y(int i) : i_(i) {}
|
|
};
|
|
|
|
struct X
|
|
{
|
|
int i_;
|
|
|
|
X(int i) : i_(i) {}
|
|
X(X&& x) : i_(x.i_) {x.i_ = 0;}
|
|
X(const Y& y) : i_(y.i_) {}
|
|
X(Y&& y) : i_(y.i_+1) {}
|
|
friend constexpr bool operator==(const X& x, const X& y)
|
|
{return x.i_ == y.i_;}
|
|
};
|
|
|
|
int main()
|
|
{
|
|
{
|
|
optional<X> opt(in_place, 2);
|
|
Y y(3);
|
|
assert(std::move(opt).value_or(y) == 2);
|
|
assert(*opt == 0);
|
|
}
|
|
{
|
|
optional<X> opt(in_place, 2);
|
|
assert(std::move(opt).value_or(Y(3)) == 2);
|
|
assert(*opt == 0);
|
|
}
|
|
{
|
|
optional<X> opt;
|
|
Y y(3);
|
|
assert(std::move(opt).value_or(y) == 3);
|
|
assert(!opt);
|
|
}
|
|
{
|
|
optional<X> opt;
|
|
assert(std::move(opt).value_or(Y(3)) == 4);
|
|
assert(!opt);
|
|
}
|
|
}
|