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.8 KiB
C++
69 lines
1.8 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>
|
|
|
|
// ~optional();
|
|
|
|
#include <optional>
|
|
#include <type_traits>
|
|
#include <cassert>
|
|
|
|
using std::optional;
|
|
|
|
struct PODType {
|
|
int value;
|
|
int value2;
|
|
};
|
|
|
|
class X
|
|
{
|
|
public:
|
|
static bool dtor_called;
|
|
X() = default;
|
|
~X() {dtor_called = true;}
|
|
};
|
|
|
|
bool X::dtor_called = false;
|
|
|
|
int main()
|
|
{
|
|
{
|
|
typedef int T;
|
|
static_assert(std::is_trivially_destructible<T>::value, "");
|
|
static_assert(std::is_trivially_destructible<optional<T>>::value, "");
|
|
static_assert(std::is_literal_type<optional<T>>::value, "");
|
|
}
|
|
{
|
|
typedef double T;
|
|
static_assert(std::is_trivially_destructible<T>::value, "");
|
|
static_assert(std::is_trivially_destructible<optional<T>>::value, "");
|
|
static_assert(std::is_literal_type<optional<T>>::value, "");
|
|
}
|
|
{
|
|
typedef PODType T;
|
|
static_assert(std::is_trivially_destructible<T>::value, "");
|
|
static_assert(std::is_trivially_destructible<optional<T>>::value, "");
|
|
static_assert(std::is_literal_type<optional<T>>::value, "");
|
|
}
|
|
{
|
|
typedef X T;
|
|
static_assert(!std::is_trivially_destructible<T>::value, "");
|
|
static_assert(!std::is_trivially_destructible<optional<T>>::value, "");
|
|
static_assert(!std::is_literal_type<optional<T>>::value, "");
|
|
{
|
|
X x;
|
|
optional<X> opt{x};
|
|
assert(X::dtor_called == false);
|
|
}
|
|
assert(X::dtor_called == true);
|
|
}
|
|
}
|