a9e659619f
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 llvm-svn: 283980
71 lines
1.9 KiB
C++
71 lines
1.9 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 T> constexpr bool operator<= (const optional<T>& x, const optional<T>& y);
|
|
|
|
#include <optional>
|
|
|
|
using std::optional;
|
|
|
|
struct X
|
|
{
|
|
int i_;
|
|
|
|
constexpr X(int i) : i_(i) {}
|
|
};
|
|
|
|
constexpr bool operator <= ( const X &lhs, const X &rhs )
|
|
{ return lhs.i_ <= rhs.i_ ; }
|
|
|
|
int main()
|
|
{
|
|
{
|
|
typedef optional<X> O;
|
|
|
|
constexpr O o1; // disengaged
|
|
constexpr O o2; // disengaged
|
|
constexpr O o3{1}; // engaged
|
|
constexpr O o4{2}; // engaged
|
|
constexpr O o5{1}; // engaged
|
|
|
|
static_assert ( (o1 <= o1), "" );
|
|
static_assert ( (o1 <= o2), "" );
|
|
static_assert ( (o1 <= o3), "" );
|
|
static_assert ( (o1 <= o4), "" );
|
|
static_assert ( (o1 <= o5), "" );
|
|
|
|
static_assert ( (o2 <= o1), "" );
|
|
static_assert ( (o2 <= o2), "" );
|
|
static_assert ( (o2 <= o3), "" );
|
|
static_assert ( (o2 <= o4), "" );
|
|
static_assert ( (o2 <= o5), "" );
|
|
|
|
static_assert ( !(o3 <= o1), "" );
|
|
static_assert ( !(o3 <= o2), "" );
|
|
static_assert ( (o3 <= o3), "" );
|
|
static_assert ( (o3 <= o4), "" );
|
|
static_assert ( (o3 <= o5), "" );
|
|
|
|
static_assert ( !(o4 <= o1), "" );
|
|
static_assert ( !(o4 <= o2), "" );
|
|
static_assert ( !(o4 <= o3), "" );
|
|
static_assert ( (o4 <= o4), "" );
|
|
static_assert ( !(o4 <= o5), "" );
|
|
|
|
static_assert ( !(o5 <= o1), "" );
|
|
static_assert ( !(o5 <= o2), "" );
|
|
static_assert ( (o5 <= o3), "" );
|
|
static_assert ( (o5 <= o4), "" );
|
|
static_assert ( (o5 <= o5), "" );
|
|
}
|
|
}
|