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:
Marshall Clow
2013-11-15 22:42:10 +00:00
parent ec5714f27a
commit 0cdbe60481
59 changed files with 523 additions and 409 deletions

View File

@@ -11,12 +11,14 @@
// template <class U> constexpr T optional<T>::value_or(U&& v) const&;
#include <optional>
#include <experimental/optional>
#include <type_traits>
#include <cassert>
#if _LIBCPP_STD_VER > 11
using std::experimental::optional;
struct Y
{
int i_;
@@ -41,39 +43,39 @@ int main()
{
#if _LIBCPP_STD_VER > 11
{
constexpr std::optional<X> opt(2);
constexpr optional<X> opt(2);
constexpr Y y(3);
static_assert(opt.value_or(y) == 2, "");
}
{
constexpr std::optional<X> opt(2);
constexpr optional<X> opt(2);
static_assert(opt.value_or(Y(3)) == 2, "");
}
{
constexpr std::optional<X> opt;
constexpr optional<X> opt;
constexpr Y y(3);
static_assert(opt.value_or(y) == 3, "");
}
{
constexpr std::optional<X> opt;
constexpr optional<X> opt;
static_assert(opt.value_or(Y(3)) == 4, "");
}
{
const std::optional<X> opt(2);
const optional<X> opt(2);
const Y y(3);
assert(opt.value_or(y) == 2);
}
{
const std::optional<X> opt(2);
const optional<X> opt(2);
assert(opt.value_or(Y(3)) == 2);
}
{
const std::optional<X> opt;
const optional<X> opt;
const Y y(3);
assert(opt.value_or(y) == 3);
}
{
const std::optional<X> opt;
const optional<X> opt;
assert(opt.value_or(Y(3)) == 4);
}
#endif // _LIBCPP_STD_VER > 11