Add all the relational operators to std::experimental::optional. Also update bad_optional_access to match the Library Fundamentals draft standard. This is not all of the upcoming changes to optional, though.
llvm-svn: 223775
diff --git a/libcxx/test/utilities/optional/optional.nullops/eqaul.pass.cpp b/libcxx/test/utilities/optional/optional.nullops/equal.pass.cpp
similarity index 92%
rename from libcxx/test/utilities/optional/optional.nullops/eqaul.pass.cpp
rename to libcxx/test/utilities/optional/optional.nullops/equal.pass.cpp
index 54fb522..931db61 100644
--- a/libcxx/test/utilities/optional/optional.nullops/eqaul.pass.cpp
+++ b/libcxx/test/utilities/optional/optional.nullops/equal.pass.cpp
@@ -29,9 +29,9 @@
constexpr O o1; // disengaged
constexpr O o2{1}; // engaged
- static_assert ( nullopt == o1 , "" );
+ static_assert ( (nullopt == o1), "" );
static_assert ( !(nullopt == o2), "" );
- static_assert ( o1 == nullopt , "" );
+ static_assert ( (o1 == nullopt), "" );
static_assert ( !(o2 == nullopt), "" );
static_assert (noexcept(nullopt == o1), "");
diff --git a/libcxx/test/utilities/optional/optional.nullops/eqaul.pass.cpp b/libcxx/test/utilities/optional/optional.nullops/greater.pass.cpp
similarity index 60%
copy from libcxx/test/utilities/optional/optional.nullops/eqaul.pass.cpp
copy to libcxx/test/utilities/optional/optional.nullops/greater.pass.cpp
index 54fb522..b72a4d3 100644
--- a/libcxx/test/utilities/optional/optional.nullops/eqaul.pass.cpp
+++ b/libcxx/test/utilities/optional/optional.nullops/greater.pass.cpp
@@ -10,8 +10,8 @@
// <optional>
-// template <class T> constexpr bool operator==(const optional<T>& x, nullopt_t) noexcept;
-// template <class T> constexpr bool operator==(nullopt_t, const optional<T>& x) noexcept;
+// template <class T> constexpr bool operator>(const optional<T>& x, nullopt_t) noexcept;
+// template <class T> constexpr bool operator>(nullopt_t, const optional<T>& x) noexcept;
#include <experimental/optional>
@@ -21,7 +21,7 @@
using std::experimental::optional;
using std::experimental::nullopt_t;
using std::experimental::nullopt;
-
+
{
typedef int T;
typedef optional<T> O;
@@ -29,13 +29,13 @@
constexpr O o1; // disengaged
constexpr O o2{1}; // engaged
- static_assert ( nullopt == o1 , "" );
- static_assert ( !(nullopt == o2), "" );
- static_assert ( o1 == nullopt , "" );
- static_assert ( !(o2 == nullopt), "" );
+ static_assert ( !(nullopt > o1), "" );
+ static_assert ( !(nullopt > o2), "" );
+ static_assert ( !(o1 > nullopt), "" );
+ static_assert ( (o2 > nullopt), "" );
- static_assert (noexcept(nullopt == o1), "");
- static_assert (noexcept(o1 == nullopt), "");
+ static_assert (noexcept(nullopt > o1), "");
+ static_assert (noexcept(o1 > nullopt), "");
}
#endif
}
diff --git a/libcxx/test/utilities/optional/optional.nullops/eqaul.pass.cpp b/libcxx/test/utilities/optional/optional.nullops/greater_equal.pass.cpp
similarity index 65%
copy from libcxx/test/utilities/optional/optional.nullops/eqaul.pass.cpp
copy to libcxx/test/utilities/optional/optional.nullops/greater_equal.pass.cpp
index 54fb522..86c8743 100644
--- a/libcxx/test/utilities/optional/optional.nullops/eqaul.pass.cpp
+++ b/libcxx/test/utilities/optional/optional.nullops/greater_equal.pass.cpp
@@ -10,8 +10,8 @@
// <optional>
-// template <class T> constexpr bool operator==(const optional<T>& x, nullopt_t) noexcept;
-// template <class T> constexpr bool operator==(nullopt_t, const optional<T>& x) noexcept;
+// template <class T> constexpr bool operator>=(const optional<T>& x, nullopt_t) noexcept;
+// template <class T> constexpr bool operator>=(nullopt_t, const optional<T>& x) noexcept;
#include <experimental/optional>
@@ -21,7 +21,7 @@
using std::experimental::optional;
using std::experimental::nullopt_t;
using std::experimental::nullopt;
-
+
{
typedef int T;
typedef optional<T> O;
@@ -29,13 +29,13 @@
constexpr O o1; // disengaged
constexpr O o2{1}; // engaged
- static_assert ( nullopt == o1 , "" );
- static_assert ( !(nullopt == o2), "" );
- static_assert ( o1 == nullopt , "" );
- static_assert ( !(o2 == nullopt), "" );
+ static_assert ( (nullopt >= o1), "" );
+ static_assert ( !(nullopt >= o2), "" );
+ static_assert ( (o1 >= nullopt), "" );
+ static_assert ( (o2 >= nullopt), "" );
- static_assert (noexcept(nullopt == o1), "");
- static_assert (noexcept(o1 == nullopt), "");
+ static_assert (noexcept(nullopt >= o1), "");
+ static_assert (noexcept(o1 >= nullopt), "");
}
#endif
}
diff --git a/libcxx/test/utilities/optional/optional.nullops/eqaul.pass.cpp b/libcxx/test/utilities/optional/optional.nullops/less_equal.pass.cpp
similarity index 65%
copy from libcxx/test/utilities/optional/optional.nullops/eqaul.pass.cpp
copy to libcxx/test/utilities/optional/optional.nullops/less_equal.pass.cpp
index 54fb522..3e8444b 100644
--- a/libcxx/test/utilities/optional/optional.nullops/eqaul.pass.cpp
+++ b/libcxx/test/utilities/optional/optional.nullops/less_equal.pass.cpp
@@ -10,8 +10,8 @@
// <optional>
-// template <class T> constexpr bool operator==(const optional<T>& x, nullopt_t) noexcept;
-// template <class T> constexpr bool operator==(nullopt_t, const optional<T>& x) noexcept;
+// template <class T> constexpr bool operator<=(const optional<T>& x, nullopt_t) noexcept;
+// template <class T> constexpr bool operator<=(nullopt_t, const optional<T>& x) noexcept;
#include <experimental/optional>
@@ -21,7 +21,7 @@
using std::experimental::optional;
using std::experimental::nullopt_t;
using std::experimental::nullopt;
-
+
{
typedef int T;
typedef optional<T> O;
@@ -29,13 +29,13 @@
constexpr O o1; // disengaged
constexpr O o2{1}; // engaged
- static_assert ( nullopt == o1 , "" );
- static_assert ( !(nullopt == o2), "" );
- static_assert ( o1 == nullopt , "" );
- static_assert ( !(o2 == nullopt), "" );
+ static_assert ( (nullopt <= o1), "" );
+ static_assert ( (nullopt <= o2), "" );
+ static_assert ( (o1 <= nullopt), "" );
+ static_assert ( !(o2 <= nullopt), "" );
- static_assert (noexcept(nullopt == o1), "");
- static_assert (noexcept(o1 == nullopt), "");
+ static_assert (noexcept(nullopt <= o1), "");
+ static_assert (noexcept(o1 <= nullopt), "");
}
#endif
}
diff --git a/libcxx/test/utilities/optional/optional.nullops/less_than.pass.cpp b/libcxx/test/utilities/optional/optional.nullops/less_than.pass.cpp
index 576a98a..149c809 100644
--- a/libcxx/test/utilities/optional/optional.nullops/less_than.pass.cpp
+++ b/libcxx/test/utilities/optional/optional.nullops/less_than.pass.cpp
@@ -30,7 +30,7 @@
constexpr O o2{1}; // engaged
static_assert ( !(nullopt < o1), "" );
- static_assert ( nullopt < o2 , "" );
+ static_assert ( (nullopt < o2), "" );
static_assert ( !(o1 < nullopt), "" );
static_assert ( !(o2 < nullopt), "" );
diff --git a/libcxx/test/utilities/optional/optional.nullops/eqaul.pass.cpp b/libcxx/test/utilities/optional/optional.nullops/not_equal.pass.cpp
similarity index 65%
copy from libcxx/test/utilities/optional/optional.nullops/eqaul.pass.cpp
copy to libcxx/test/utilities/optional/optional.nullops/not_equal.pass.cpp
index 54fb522..6f28edf 100644
--- a/libcxx/test/utilities/optional/optional.nullops/eqaul.pass.cpp
+++ b/libcxx/test/utilities/optional/optional.nullops/not_equal.pass.cpp
@@ -10,8 +10,8 @@
// <optional>
-// template <class T> constexpr bool operator==(const optional<T>& x, nullopt_t) noexcept;
-// template <class T> constexpr bool operator==(nullopt_t, const optional<T>& x) noexcept;
+// template <class T> constexpr bool operator!=(const optional<T>& x, nullopt_t) noexcept;
+// template <class T> constexpr bool operator!=(nullopt_t, const optional<T>& x) noexcept;
#include <experimental/optional>
@@ -29,13 +29,13 @@
constexpr O o1; // disengaged
constexpr O o2{1}; // engaged
- static_assert ( nullopt == o1 , "" );
- static_assert ( !(nullopt == o2), "" );
- static_assert ( o1 == nullopt , "" );
- static_assert ( !(o2 == nullopt), "" );
+ static_assert ( !(nullopt != o1), "" );
+ static_assert ( (nullopt != o2), "" );
+ static_assert ( !(o1 != nullopt), "" );
+ static_assert ( (o2 != nullopt), "" );
- static_assert (noexcept(nullopt == o1), "");
- static_assert (noexcept(o1 == nullopt), "");
+ static_assert (noexcept(nullopt != o1), "");
+ static_assert (noexcept(o1 != nullopt), "");
}
#endif
}