Move <optional> into include/experimental, and into the std::experimental namespace, since it's not part of C++14, but of an upcoming TS
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@194867 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -11,12 +11,16 @@
|
||||
|
||||
// optional<T>& operator=(nullopt_t) noexcept;
|
||||
|
||||
#include <optional>
|
||||
#include <experimental/optional>
|
||||
#include <type_traits>
|
||||
#include <cassert>
|
||||
|
||||
#if _LIBCPP_STD_VER > 11
|
||||
|
||||
using std::experimental::optional;
|
||||
using std::experimental::nullopt_t;
|
||||
using std::experimental::nullopt;
|
||||
|
||||
struct X
|
||||
{
|
||||
static bool dtor_called;
|
||||
@@ -31,30 +35,30 @@ int main()
|
||||
{
|
||||
#if _LIBCPP_STD_VER > 11
|
||||
{
|
||||
std::optional<int> opt;
|
||||
static_assert(noexcept(opt = std::nullopt) == true, "");
|
||||
opt = std::nullopt;
|
||||
optional<int> opt;
|
||||
static_assert(noexcept(opt = nullopt) == true, "");
|
||||
opt = nullopt;
|
||||
assert(static_cast<bool>(opt) == false);
|
||||
}
|
||||
{
|
||||
std::optional<int> opt(3);
|
||||
opt = std::nullopt;
|
||||
optional<int> opt(3);
|
||||
opt = nullopt;
|
||||
assert(static_cast<bool>(opt) == false);
|
||||
}
|
||||
{
|
||||
std::optional<X> opt;
|
||||
static_assert(noexcept(opt = std::nullopt) == true, "");
|
||||
optional<X> opt;
|
||||
static_assert(noexcept(opt = nullopt) == true, "");
|
||||
assert(X::dtor_called == false);
|
||||
opt = std::nullopt;
|
||||
opt = nullopt;
|
||||
assert(X::dtor_called == false);
|
||||
assert(static_cast<bool>(opt) == false);
|
||||
}
|
||||
{
|
||||
X x;
|
||||
{
|
||||
std::optional<X> opt(x);
|
||||
optional<X> opt(x);
|
||||
assert(X::dtor_called == false);
|
||||
opt = std::nullopt;
|
||||
opt = nullopt;
|
||||
assert(X::dtor_called == true);
|
||||
assert(static_cast<bool>(opt) == false);
|
||||
}
|
||||
|
Reference in New Issue
Block a user