Move <optional> into include/experimental, and into the std::experimental namespace, since it's not part of C++14, but of an upcoming TS

llvm-svn: 194867
This commit is contained in:
Marshall Clow
2013-11-15 22:42:10 +00:00
parent 3f823e3af1
commit dfdac03c8f
59 changed files with 523 additions and 409 deletions

View File

@@ -11,12 +11,14 @@
// constexpr optional(T&& v);
#include <optional>
#include <experimental/optional>
#include <type_traits>
#include <cassert>
#if _LIBCPP_STD_VER > 11
using std::experimental::optional;
class X
{
int i_;
@@ -52,42 +54,42 @@ int main()
#if _LIBCPP_STD_VER > 11
{
typedef int T;
constexpr std::optional<T> opt(T(5));
constexpr optional<T> opt(T(5));
static_assert(static_cast<bool>(opt) == true, "");
static_assert(*opt == 5, "");
struct test_constexpr_ctor
: public std::optional<T>
: public optional<T>
{
constexpr test_constexpr_ctor(T&&) {}
};
}
{
typedef double T;
constexpr std::optional<T> opt(T(3));
constexpr optional<T> opt(T(3));
static_assert(static_cast<bool>(opt) == true, "");
static_assert(*opt == 3, "");
struct test_constexpr_ctor
: public std::optional<T>
: public optional<T>
{
constexpr test_constexpr_ctor(T&&) {}
};
}
{
typedef X T;
std::optional<T> opt(T(3));
optional<T> opt(T(3));
assert(static_cast<bool>(opt) == true);
assert(*opt == 3);
}
{
typedef Y T;
constexpr std::optional<T> opt(T(3));
constexpr optional<T> opt(T(3));
static_assert(static_cast<bool>(opt) == true, "");
static_assert(*opt == 3, "");
struct test_constexpr_ctor
: public std::optional<T>
: public optional<T>
{
constexpr test_constexpr_ctor(T&&) {}
};
@@ -96,7 +98,7 @@ int main()
typedef Z T;
try
{
std::optional<T> opt(T(3));
optional<T> opt(T(3));
assert(false);
}
catch (int i)