Author: ericwf
Date: Thu Mar 30 15:06:52 2017
New Revision: 299105
URL: http://llvm.org/viewvc/llvm-project?rev=299105&view=rev
Log:
Fix LWG 2934 - optional<const T> doesn't compare with T
Modified:
libcxx/trunk/include/optional
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
libcxx/trunk/test/std/utilities/optional/optional.relops/equal.pass.cpp
libcxx/trunk/test/std/utilities/optional/optional.relops/greater_equal.pass.cpp
libcxx/trunk/test/std/utilities/optional/optional.relops/greater_than.pass.cpp
libcxx/trunk/test/std/utilities/optional/optional.relops/less_equal.pass.cpp
libcxx/trunk/test/std/utilities/optional/optional.relops/less_than.pass.cpp
libcxx/trunk/test/std/utilities/optional/optional.relops/not_equal.pass.cpp
libcxx/trunk/www/cxx1z_status.html
Modified: libcxx/trunk/include/optional
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/optional?rev=299105&r1=299104&r2=299105&view=diff
==============================================================================
--- libcxx/trunk/include/optional (original)
+++ libcxx/trunk/include/optional Thu Mar 30 15:06:52 2017
@@ -921,14 +921,14 @@ private:
};
// Comparisons between optionals
-template <class _Tp>
+template <class _Tp, class _Up>
_LIBCPP_INLINE_VISIBILITY constexpr
enable_if_t<
is_convertible_v<decltype(_VSTD::declval<const _Tp&>() ==
- _VSTD::declval<const _Tp&>()), bool>,
+ _VSTD::declval<const _Up&>()), bool>,
bool
>
-operator==(const optional<_Tp>& __x, const optional<_Tp>& __y)
+operator==(const optional<_Tp>& __x, const optional<_Up>& __y)
{
if (static_cast<bool>(__x) != static_cast<bool>(__y))
return false;
@@ -937,14 +937,14 @@ operator==(const optional<_Tp>& __x, con
return *__x == *__y;
}
-template <class _Tp>
+template <class _Tp, class _Up>
_LIBCPP_INLINE_VISIBILITY constexpr
enable_if_t<
is_convertible_v<decltype(_VSTD::declval<const _Tp&>() !=
- _VSTD::declval<const _Tp&>()), bool>,
+ _VSTD::declval<const _Up&>()), bool>,
bool
>
-operator!=(const optional<_Tp>& __x, const optional<_Tp>& __y)
+operator!=(const optional<_Tp>& __x, const optional<_Up>& __y)
{
if (static_cast<bool>(__x) != static_cast<bool>(__y))
return true;
@@ -953,14 +953,14 @@ operator!=(const optional<_Tp>& __x, con
return *__x != *__y;
}
-template <class _Tp>
+template <class _Tp, class _Up>
_LIBCPP_INLINE_VISIBILITY constexpr
enable_if_t<
is_convertible_v<decltype(_VSTD::declval<const _Tp&>() <
- _VSTD::declval<const _Tp&>()), bool>,
+ _VSTD::declval<const _Up&>()), bool>,
bool
>
-operator<(const optional<_Tp>& __x, const optional<_Tp>& __y)
+operator<(const optional<_Tp>& __x, const optional<_Up>& __y)
{
if (!static_cast<bool>(__y))
return false;
@@ -969,14 +969,14 @@ operator<(const optional<_Tp>& __x, cons
return *__x < *__y;
}
-template <class _Tp>
+template <class _Tp, class _Up>
_LIBCPP_INLINE_VISIBILITY constexpr
enable_if_t<
is_convertible_v<decltype(_VSTD::declval<const _Tp&>() >
- _VSTD::declval<const _Tp&>()), bool>,
+ _VSTD::declval<const _Up&>()), bool>,
bool
>
-operator>(const optional<_Tp>& __x, const optional<_Tp>& __y)
+operator>(const optional<_Tp>& __x, const optional<_Up>& __y)
{
if (!static_cast<bool>(__x))
return false;
@@ -985,14 +985,14 @@ operator>(const optional<_Tp>& __x, cons
return *__x > *__y;
}
-template <class _Tp>
+template <class _Tp, class _Up>
_LIBCPP_INLINE_VISIBILITY constexpr
enable_if_t<
is_convertible_v<decltype(_VSTD::declval<const _Tp&>() <=
- _VSTD::declval<const _Tp&>()), bool>,
+ _VSTD::declval<const _Up&>()), bool>,
bool
>
-operator<=(const optional<_Tp>& __x, const optional<_Tp>& __y)
+operator<=(const optional<_Tp>& __x, const optional<_Up>& __y)
{
if (!static_cast<bool>(__x))
return true;
@@ -1001,14 +1001,14 @@ operator<=(const optional<_Tp>& __x, con
return *__x <= *__y;
}
-template <class _Tp>
+template <class _Tp, class _Up>
_LIBCPP_INLINE_VISIBILITY constexpr
enable_if_t<
is_convertible_v<decltype(_VSTD::declval<const _Tp&>() >=
- _VSTD::declval<const _Tp&>()), bool>,
+ _VSTD::declval<const _Up&>()), bool>,
bool
>
-operator>=(const optional<_Tp>& __x, const optional<_Tp>& __y)
+operator>=(const optional<_Tp>& __x, const optional<_Up>& __y)
{
if (!static_cast<bool>(__y))
return true;
@@ -1115,146 +1115,146 @@ operator>=(nullopt_t, const optional<_Tp
}
// Comparisons with T
-template <class _Tp>
+template <class _Tp, class _Up>
_LIBCPP_INLINE_VISIBILITY constexpr
enable_if_t<
is_convertible_v<decltype(_VSTD::declval<const _Tp&>() ==
- _VSTD::declval<const _Tp&>()), bool>,
+ _VSTD::declval<const _Up&>()), bool>,
bool
>
-operator==(const optional<_Tp>& __x, const _Tp& __v)
+operator==(const optional<_Tp>& __x, const _Up& __v)
{
return static_cast<bool>(__x) ? *__x == __v : false;
}
-template <class _Tp>
+template <class _Tp, class _Up>
_LIBCPP_INLINE_VISIBILITY constexpr
enable_if_t<
is_convertible_v<decltype(_VSTD::declval<const _Tp&>() ==
- _VSTD::declval<const _Tp&>()), bool>,
+ _VSTD::declval<const _Up&>()), bool>,
bool
>
-operator==(const _Tp& __v, const optional<_Tp>& __x)
+operator==(const _Tp& __v, const optional<_Up>& __x)
{
return static_cast<bool>(__x) ? __v == *__x : false;
}
-template <class _Tp>
+template <class _Tp, class _Up>
_LIBCPP_INLINE_VISIBILITY constexpr
enable_if_t<
is_convertible_v<decltype(_VSTD::declval<const _Tp&>() !=
- _VSTD::declval<const _Tp&>()), bool>,
+ _VSTD::declval<const _Up&>()), bool>,
bool
>
-operator!=(const optional<_Tp>& __x, const _Tp& __v)
+operator!=(const optional<_Tp>& __x, const _Up& __v)
{
return static_cast<bool>(__x) ? *__x != __v : true;
}
-template <class _Tp>
+template <class _Tp, class _Up>
_LIBCPP_INLINE_VISIBILITY constexpr
enable_if_t<
is_convertible_v<decltype(_VSTD::declval<const _Tp&>() !=
- _VSTD::declval<const _Tp&>()), bool>,
+ _VSTD::declval<const _Up&>()), bool>,
bool
>
-operator!=(const _Tp& __v, const optional<_Tp>& __x)
+operator!=(const _Tp& __v, const optional<_Up>& __x)
{
return static_cast<bool>(__x) ? __v != *__x : true;
}
-template <class _Tp>
+template <class _Tp, class _Up>
_LIBCPP_INLINE_VISIBILITY constexpr
enable_if_t<
is_convertible_v<decltype(_VSTD::declval<const _Tp&>() <
- _VSTD::declval<const _Tp&>()), bool>,
+ _VSTD::declval<const _Up&>()), bool>,
bool
>
-operator<(const optional<_Tp>& __x, const _Tp& __v)
+operator<(const optional<_Tp>& __x, const _Up& __v)
{
return static_cast<bool>(__x) ? *__x < __v : true;
}
-template <class _Tp>
+template <class _Tp, class _Up>
_LIBCPP_INLINE_VISIBILITY constexpr
enable_if_t<
is_convertible_v<decltype(_VSTD::declval<const _Tp&>() <
- _VSTD::declval<const _Tp&>()), bool>,
+ _VSTD::declval<const _Up&>()), bool>,
bool
>
-operator<(const _Tp& __v, const optional<_Tp>& __x)
+operator<(const _Tp& __v, const optional<_Up>& __x)
{
return static_cast<bool>(__x) ? __v < *__x : false;
}
-template <class _Tp>
+template <class _Tp, class _Up>
_LIBCPP_INLINE_VISIBILITY constexpr
enable_if_t<
is_convertible_v<decltype(_VSTD::declval<const _Tp&>() <=
- _VSTD::declval<const _Tp&>()), bool>,
+ _VSTD::declval<const _Up&>()), bool>,
bool
>
-operator<=(const optional<_Tp>& __x, const _Tp& __v)
+operator<=(const optional<_Tp>& __x, const _Up& __v)
{
return static_cast<bool>(__x) ? *__x <= __v : true;
}
-template <class _Tp>
+template <class _Tp, class _Up>
_LIBCPP_INLINE_VISIBILITY constexpr
enable_if_t<
is_convertible_v<decltype(_VSTD::declval<const _Tp&>() <=
- _VSTD::declval<const _Tp&>()), bool>,
+ _VSTD::declval<const _Up&>()), bool>,
bool
>
-operator<=(const _Tp& __v, const optional<_Tp>& __x)
+operator<=(const _Tp& __v, const optional<_Up>& __x)
{
return static_cast<bool>(__x) ? __v <= *__x : false;
}
-template <class _Tp>
+template <class _Tp, class _Up>
_LIBCPP_INLINE_VISIBILITY constexpr
enable_if_t<
is_convertible_v<decltype(_VSTD::declval<const _Tp&>() >
- _VSTD::declval<const _Tp&>()), bool>,
+ _VSTD::declval<const _Up&>()), bool>,
bool
>
-operator>(const optional<_Tp>& __x, const _Tp& __v)
+operator>(const optional<_Tp>& __x, const _Up& __v)
{
return static_cast<bool>(__x) ? *__x > __v : false;
}
-template <class _Tp>
+template <class _Tp, class _Up>
_LIBCPP_INLINE_VISIBILITY constexpr
enable_if_t<
is_convertible_v<decltype(_VSTD::declval<const _Tp&>() >
- _VSTD::declval<const _Tp&>()), bool>,
+ _VSTD::declval<const _Up&>()), bool>,
bool
>
-operator>(const _Tp& __v, const optional<_Tp>& __x)
+operator>(const _Tp& __v, const optional<_Up>& __x)
{
return static_cast<bool>(__x) ? __v > *__x : true;
}
-template <class _Tp>
+template <class _Tp, class _Up>
_LIBCPP_INLINE_VISIBILITY constexpr
enable_if_t<
is_convertible_v<decltype(_VSTD::declval<const _Tp&>() >=
- _VSTD::declval<const _Tp&>()), bool>,
+ _VSTD::declval<const _Up&>()), bool>,
bool
>
-operator>=(const optional<_Tp>& __x, const _Tp& __v)
+operator>=(const optional<_Tp>& __x, const _Up& __v)
{
return static_cast<bool>(__x) ? *__x >= __v : false;
}
-template <class _Tp>
+template <class _Tp, class _Up>
_LIBCPP_INLINE_VISIBILITY constexpr
enable_if_t<
is_convertible_v<decltype(_VSTD::declval<const _Tp&>() >=
- _VSTD::declval<const _Tp&>()), bool>,
+ _VSTD::declval<const _Up&>()), bool>,
bool
>
-operator>=(const _Tp& __v, const optional<_Tp>& __x)
+operator>=(const _Tp& __v, const optional<_Up>& __x)
{
return static_cast<bool>(__x) ? __v >= *__x : true;
}
Modified:
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp?rev=299105&r1=299104&r2=299105&view=diff
==============================================================================
---
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp
(original)
+++
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp
Thu Mar 30 15:06:52 2017
@@ -17,37 +17,48 @@
using std::optional;
-struct X
-{
- int i_;
+struct X {
+ int i_;
- constexpr X(int i) : i_(i) {}
+ constexpr X(int i) : i_(i) {}
};
-constexpr bool operator == ( const X &lhs, const X &rhs )
- { return lhs.i_ == rhs.i_ ; }
+constexpr bool operator==(const X& lhs, const X& rhs) {
+ return lhs.i_ == rhs.i_;
+}
-int main()
-{
- {
+int main() {
+ {
typedef X T;
typedef optional<T> O;
constexpr T val(2);
- constexpr O o1; // disengaged
- constexpr O o2{1}; // engaged
- constexpr O o3{val}; // engaged
-
- static_assert ( !(o1 == T(1)), "" );
- static_assert ( (o2 == T(1)), "" );
- static_assert ( !(o3 == T(1)), "" );
- static_assert ( (o3 == T(2)), "" );
- static_assert ( (o3 == val), "" );
-
- static_assert ( !(T(1) == o1), "" );
- static_assert ( (T(1) == o2), "" );
- static_assert ( !(T(1) == o3), "" );
- static_assert ( (T(2) == o3), "" );
- static_assert ( (val == o3), "" );
- }
+ constexpr O o1; // disengaged
+ constexpr O o2{1}; // engaged
+ constexpr O o3{val}; // engaged
+
+ static_assert(!(o1 == T(1)), "");
+ static_assert((o2 == T(1)), "");
+ static_assert(!(o3 == T(1)), "");
+ static_assert((o3 == T(2)), "");
+ static_assert((o3 == val), "");
+
+ static_assert(!(T(1) == o1), "");
+ static_assert((T(1) == o2), "");
+ static_assert(!(T(1) == o3), "");
+ static_assert((T(2) == o3), "");
+ static_assert((val == o3), "");
+ }
+ {
+ using O = optional<int>;
+ constexpr O o1(42);
+ static_assert(o1 == 42l, "");
+ static_assert(!(101l == o1), "");
+ }
+ {
+ using O = optional<const int>;
+ constexpr O o1(42);
+ static_assert(o1 == 42, "");
+ static_assert(!(101 == o1), "");
+ }
}
Modified:
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp?rev=299105&r1=299104&r2=299105&view=diff
==============================================================================
---
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp
(original)
+++
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp
Thu Mar 30 15:06:52 2017
@@ -17,39 +17,48 @@
using std::optional;
-struct X
-{
- int i_;
+struct X {
+ int i_;
- constexpr X(int i) : i_(i) {}
+ constexpr X(int i) : i_(i) {}
};
-constexpr bool operator > ( const X &lhs, const X &rhs )
- { return lhs.i_ > rhs.i_ ; }
+constexpr bool operator>(const X& lhs, const X& rhs) { return lhs.i_ > rhs.i_;
}
-int main()
-{
- {
+int main() {
+ {
typedef X T;
typedef optional<T> O;
constexpr T val(2);
- constexpr O o1; // disengaged
- constexpr O o2{1}; // engaged
- constexpr O o3{val}; // engaged
-
- static_assert ( !(o1 > T(1)), "" );
- static_assert ( !(o2 > T(1)), "" ); // equal
- static_assert ( (o3 > T(1)), "" );
- static_assert ( !(o2 > val), "" );
- static_assert ( !(o3 > val), "" ); // equal
- static_assert ( !(o3 > T(3)), "" );
-
- static_assert ( (T(1) > o1), "" );
- static_assert ( !(T(1) > o2), "" ); // equal
- static_assert ( !(T(1) > o3), "" );
- static_assert ( (val > o2), "" );
- static_assert ( !(val > o3), "" ); // equal
- static_assert ( (T(3) > o3), "" );
- }
+ constexpr O o1; // disengaged
+ constexpr O o2{1}; // engaged
+ constexpr O o3{val}; // engaged
+
+ static_assert(!(o1 > T(1)), "");
+ static_assert(!(o2 > T(1)), ""); // equal
+ static_assert((o3 > T(1)), "");
+ static_assert(!(o2 > val), "");
+ static_assert(!(o3 > val), ""); // equal
+ static_assert(!(o3 > T(3)), "");
+
+ static_assert((T(1) > o1), "");
+ static_assert(!(T(1) > o2), ""); // equal
+ static_assert(!(T(1) > o3), "");
+ static_assert((val > o2), "");
+ static_assert(!(val > o3), ""); // equal
+ static_assert((T(3) > o3), "");
+ }
+ {
+ using O = optional<int>;
+ constexpr O o1(42);
+ static_assert(o1 > 11l, "");
+ static_assert(!(42l > o1), "");
+ }
+ {
+ using O = optional<const int>;
+ constexpr O o1(42);
+ static_assert(o1 > 11, "");
+ static_assert(!(42 > o1), "");
+ }
}
Modified:
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp?rev=299105&r1=299104&r2=299105&view=diff
==============================================================================
---
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp
(original)
+++
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp
Thu Mar 30 15:06:52 2017
@@ -17,39 +17,50 @@
using std::optional;
-struct X
-{
- int i_;
+struct X {
+ int i_;
- constexpr X(int i) : i_(i) {}
+ constexpr X(int i) : i_(i) {}
};
-constexpr bool operator >= ( const X &lhs, const X &rhs )
- { return lhs.i_ >= rhs.i_ ; }
+constexpr bool operator>=(const X& lhs, const X& rhs) {
+ return lhs.i_ >= rhs.i_;
+}
-int main()
-{
- {
+int main() {
+ {
typedef X T;
typedef optional<T> O;
constexpr T val(2);
- constexpr O o1; // disengaged
- constexpr O o2{1}; // engaged
- constexpr O o3{val}; // engaged
-
- static_assert ( !(o1 >= T(1)), "" );
- static_assert ( (o2 >= T(1)), "" ); // equal
- static_assert ( (o3 >= T(1)), "" );
- static_assert ( !(o2 >= val), "" );
- static_assert ( (o3 >= val), "" ); // equal
- static_assert ( !(o3 >= T(3)), "" );
-
- static_assert ( (T(1) >= o1), "" );
- static_assert ( (T(1) >= o2), "" ); // equal
- static_assert ( !(T(1) >= o3), "" );
- static_assert ( (val >= o2), "" );
- static_assert ( (val >= o3), "" ); // equal
- static_assert ( (T(3) >= o3), "" );
- }
+ constexpr O o1; // disengaged
+ constexpr O o2{1}; // engaged
+ constexpr O o3{val}; // engaged
+
+ static_assert(!(o1 >= T(1)), "");
+ static_assert((o2 >= T(1)), ""); // equal
+ static_assert((o3 >= T(1)), "");
+ static_assert(!(o2 >= val), "");
+ static_assert((o3 >= val), ""); // equal
+ static_assert(!(o3 >= T(3)), "");
+
+ static_assert((T(1) >= o1), "");
+ static_assert((T(1) >= o2), ""); // equal
+ static_assert(!(T(1) >= o3), "");
+ static_assert((val >= o2), "");
+ static_assert((val >= o3), ""); // equal
+ static_assert((T(3) >= o3), "");
+ }
+ {
+ using O = optional<int>;
+ constexpr O o1(42);
+ static_assert(o1 >= 42l, "");
+ static_assert(!(11l >= o1), "");
+ }
+ {
+ using O = optional<const int>;
+ constexpr O o1(42);
+ static_assert(o1 >= 42, "");
+ static_assert(!(11 >= o1), "");
+ }
}
Modified:
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp?rev=299105&r1=299104&r2=299105&view=diff
==============================================================================
---
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp
(original)
+++
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp
Thu Mar 30 15:06:52 2017
@@ -17,39 +17,50 @@
using std::optional;
-struct X
-{
- int i_;
+struct X {
+ int i_;
- constexpr X(int i) : i_(i) {}
+ constexpr X(int i) : i_(i) {}
};
-constexpr bool operator <= ( const X &lhs, const X &rhs )
- { return lhs.i_ <= rhs.i_ ; }
+constexpr bool operator<=(const X& lhs, const X& rhs) {
+ return lhs.i_ <= rhs.i_;
+}
-int main()
-{
- {
+int main() {
+ {
typedef X T;
typedef optional<T> O;
constexpr T val(2);
- constexpr O o1; // disengaged
- constexpr O o2{1}; // engaged
- constexpr O o3{val}; // engaged
-
- static_assert ( (o1 <= T(1)), "" );
- static_assert ( (o2 <= T(1)), "" ); // equal
- static_assert ( !(o3 <= T(1)), "" );
- static_assert ( (o2 <= val), "" );
- static_assert ( (o3 <= val), "" ); // equal
- static_assert ( (o3 <= T(3)), "" );
-
- static_assert ( !(T(1) <= o1), "" );
- static_assert ( (T(1) <= o2), "" ); // equal
- static_assert ( (T(1) <= o3), "" );
- static_assert ( !(val <= o2), "" );
- static_assert ( (val <= o3), "" ); // equal
- static_assert ( !(T(3) <= o3), "" );
- }
+ constexpr O o1; // disengaged
+ constexpr O o2{1}; // engaged
+ constexpr O o3{val}; // engaged
+
+ static_assert((o1 <= T(1)), "");
+ static_assert((o2 <= T(1)), ""); // equal
+ static_assert(!(o3 <= T(1)), "");
+ static_assert((o2 <= val), "");
+ static_assert((o3 <= val), ""); // equal
+ static_assert((o3 <= T(3)), "");
+
+ static_assert(!(T(1) <= o1), "");
+ static_assert((T(1) <= o2), ""); // equal
+ static_assert((T(1) <= o3), "");
+ static_assert(!(val <= o2), "");
+ static_assert((val <= o3), ""); // equal
+ static_assert(!(T(3) <= o3), "");
+ }
+ {
+ using O = optional<int>;
+ constexpr O o1(42);
+ static_assert(o1 <= 42l, "");
+ static_assert(!(101l <= o1), "");
+ }
+ {
+ using O = optional<const int>;
+ constexpr O o1(42);
+ static_assert(o1 <= 42, "");
+ static_assert(!(101 <= o1), "");
+ }
}
Modified:
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp?rev=299105&r1=299104&r2=299105&view=diff
==============================================================================
---
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp
(original)
+++
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp
Thu Mar 30 15:06:52 2017
@@ -17,39 +17,48 @@
using std::optional;
-struct X
-{
- int i_;
+struct X {
+ int i_;
- constexpr X(int i) : i_(i) {}
+ constexpr X(int i) : i_(i) {}
};
-constexpr bool operator < ( const X &lhs, const X &rhs )
- { return lhs.i_ < rhs.i_ ; }
+constexpr bool operator<(const X& lhs, const X& rhs) { return lhs.i_ < rhs.i_;
}
-int main()
-{
- {
+int main() {
+ {
typedef X T;
typedef optional<T> O;
constexpr T val(2);
- constexpr O o1; // disengaged
- constexpr O o2{1}; // engaged
- constexpr O o3{val}; // engaged
-
- static_assert ( (o1 < T(1)), "" );
- static_assert ( !(o2 < T(1)), "" ); // equal
- static_assert ( !(o3 < T(1)), "" );
- static_assert ( (o2 < val), "" );
- static_assert ( !(o3 < val), "" ); // equal
- static_assert ( (o3 < T(3)), "" );
-
- static_assert ( !(T(1) < o1), "" );
- static_assert ( !(T(1) < o2), "" ); // equal
- static_assert ( (T(1) < o3), "" );
- static_assert ( !(val < o2), "" );
- static_assert ( !(val < o3), "" ); // equal
- static_assert ( !(T(3) < o3), "" );
- }
+ constexpr O o1; // disengaged
+ constexpr O o2{1}; // engaged
+ constexpr O o3{val}; // engaged
+
+ static_assert((o1 < T(1)), "");
+ static_assert(!(o2 < T(1)), ""); // equal
+ static_assert(!(o3 < T(1)), "");
+ static_assert((o2 < val), "");
+ static_assert(!(o3 < val), ""); // equal
+ static_assert((o3 < T(3)), "");
+
+ static_assert(!(T(1) < o1), "");
+ static_assert(!(T(1) < o2), ""); // equal
+ static_assert((T(1) < o3), "");
+ static_assert(!(val < o2), "");
+ static_assert(!(val < o3), ""); // equal
+ static_assert(!(T(3) < o3), "");
+ }
+ {
+ using O = optional<int>;
+ constexpr O o1(42);
+ static_assert(o1 < 101l, "");
+ static_assert(!(42l < o1), "");
+ }
+ {
+ using O = optional<const int>;
+ constexpr O o1(42);
+ static_assert(o1 < 101, "");
+ static_assert(!(42 < o1), "");
+ }
}
Modified:
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp?rev=299105&r1=299104&r2=299105&view=diff
==============================================================================
---
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
(original)
+++
libcxx/trunk/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
Thu Mar 30 15:06:52 2017
@@ -17,37 +17,48 @@
using std::optional;
-struct X
-{
- int i_;
+struct X {
+ int i_;
- constexpr X(int i) : i_(i) {}
+ constexpr X(int i) : i_(i) {}
};
-constexpr bool operator != ( const X &lhs, const X &rhs )
- { return lhs.i_ != rhs.i_ ; }
+constexpr bool operator!=(const X& lhs, const X& rhs) {
+ return lhs.i_ != rhs.i_;
+}
-int main()
-{
- {
+int main() {
+ {
typedef X T;
typedef optional<T> O;
constexpr T val(2);
- constexpr O o1; // disengaged
- constexpr O o2{1}; // engaged
- constexpr O o3{val}; // engaged
-
- static_assert ( (o1 != T(1)), "" );
- static_assert ( !(o2 != T(1)), "" );
- static_assert ( (o3 != T(1)), "" );
- static_assert ( !(o3 != T(2)), "" );
- static_assert ( !(o3 != val), "" );
-
- static_assert ( (T(1) != o1), "" );
- static_assert ( !(T(1) != o2), "" );
- static_assert ( (T(1) != o3), "" );
- static_assert ( !(T(2) != o3), "" );
- static_assert ( !(val != o3), "" );
- }
+ constexpr O o1; // disengaged
+ constexpr O o2{1}; // engaged
+ constexpr O o3{val}; // engaged
+
+ static_assert((o1 != T(1)), "");
+ static_assert(!(o2 != T(1)), "");
+ static_assert((o3 != T(1)), "");
+ static_assert(!(o3 != T(2)), "");
+ static_assert(!(o3 != val), "");
+
+ static_assert((T(1) != o1), "");
+ static_assert(!(T(1) != o2), "");
+ static_assert((T(1) != o3), "");
+ static_assert(!(T(2) != o3), "");
+ static_assert(!(val != o3), "");
+ }
+ {
+ using O = optional<int>;
+ constexpr O o1(42);
+ static_assert(o1 != 101l, "");
+ static_assert(!(42l != o1), "");
+ }
+ {
+ using O = optional<const int>;
+ constexpr O o1(42);
+ static_assert(o1 != 101, "");
+ static_assert(!(42 != o1), "");
+ }
}
Modified:
libcxx/trunk/test/std/utilities/optional/optional.relops/equal.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/optional/optional.relops/equal.pass.cpp?rev=299105&r1=299104&r2=299105&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/optional/optional.relops/equal.pass.cpp
(original)
+++ libcxx/trunk/test/std/utilities/optional/optional.relops/equal.pass.cpp Thu
Mar 30 15:06:52 2017
@@ -18,57 +18,69 @@
using std::optional;
-struct X
-{
- int i_;
+struct X {
+ int i_;
- constexpr X(int i) : i_(i) {}
+ constexpr X(int i) : i_(i) {}
};
-constexpr bool operator == ( const X &lhs, const X &rhs )
- { return lhs.i_ == rhs.i_ ; }
+constexpr bool operator==(const X& lhs, const X& rhs) {
+ return lhs.i_ == rhs.i_;
+}
-int main()
-{
- {
+int main() {
+ {
typedef X T;
typedef optional<T> O;
- constexpr O o1; // disengaged
- constexpr O o2; // disengaged
- constexpr O o3{1}; // engaged
- constexpr O o4{2}; // engaged
- constexpr O o5{1}; // engaged
-
- static_assert ( o1 == o1 , "" );
- static_assert ( o1 == o2 , "" );
- static_assert ( !(o1 == o3), "" );
- static_assert ( !(o1 == o4), "" );
- static_assert ( !(o1 == o5), "" );
-
- static_assert ( o2 == o1 , "" );
- static_assert ( o2 == o2 , "" );
- static_assert ( !(o2 == o3), "" );
- static_assert ( !(o2 == o4), "" );
- static_assert ( !(o2 == o5), "" );
-
- static_assert ( !(o3 == o1), "" );
- static_assert ( !(o3 == o2), "" );
- static_assert ( o3 == o3 , "" );
- static_assert ( !(o3 == o4), "" );
- static_assert ( o3 == o5 , "" );
-
- static_assert ( !(o4 == o1), "" );
- static_assert ( !(o4 == o2), "" );
- static_assert ( !(o4 == o3), "" );
- static_assert ( o4 == o4 , "" );
- static_assert ( !(o4 == o5), "" );
-
- static_assert ( !(o5 == o1), "" );
- static_assert ( !(o5 == o2), "" );
- static_assert ( o5 == o3 , "" );
- static_assert ( !(o5 == o4), "" );
- static_assert ( o5 == o5 , "" );
-
- }
+ constexpr O o1; // disengaged
+ constexpr O o2; // disengaged
+ constexpr O o3{1}; // engaged
+ constexpr O o4{2}; // engaged
+ constexpr O o5{1}; // engaged
+
+ static_assert(o1 == o1, "");
+ static_assert(o1 == o2, "");
+ static_assert(!(o1 == o3), "");
+ static_assert(!(o1 == o4), "");
+ static_assert(!(o1 == o5), "");
+
+ static_assert(o2 == o1, "");
+ static_assert(o2 == o2, "");
+ static_assert(!(o2 == o3), "");
+ static_assert(!(o2 == o4), "");
+ static_assert(!(o2 == o5), "");
+
+ static_assert(!(o3 == o1), "");
+ static_assert(!(o3 == o2), "");
+ static_assert(o3 == o3, "");
+ static_assert(!(o3 == o4), "");
+ static_assert(o3 == o5, "");
+
+ static_assert(!(o4 == o1), "");
+ static_assert(!(o4 == o2), "");
+ static_assert(!(o4 == o3), "");
+ static_assert(o4 == o4, "");
+ static_assert(!(o4 == o5), "");
+
+ static_assert(!(o5 == o1), "");
+ static_assert(!(o5 == o2), "");
+ static_assert(o5 == o3, "");
+ static_assert(!(o5 == o4), "");
+ static_assert(o5 == o5, "");
+ }
+ {
+ using O1 = optional<int>;
+ using O2 = optional<long>;
+ constexpr O1 o1(42);
+ static_assert(o1 == O2(42), "");
+ static_assert(!(O2(101) == o1), "");
+ }
+ {
+ using O1 = optional<int>;
+ using O2 = optional<const int>;
+ constexpr O1 o1(42);
+ static_assert(o1 == O2(42), "");
+ static_assert(!(O2(101) == o1), "");
+ }
}
Modified:
libcxx/trunk/test/std/utilities/optional/optional.relops/greater_equal.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/optional/optional.relops/greater_equal.pass.cpp?rev=299105&r1=299104&r2=299105&view=diff
==============================================================================
---
libcxx/trunk/test/std/utilities/optional/optional.relops/greater_equal.pass.cpp
(original)
+++
libcxx/trunk/test/std/utilities/optional/optional.relops/greater_equal.pass.cpp
Thu Mar 30 15:06:52 2017
@@ -16,55 +16,68 @@
using std::optional;
-struct X
-{
- int i_;
+struct X {
+ int i_;
- constexpr X(int i) : i_(i) {}
+ constexpr X(int i) : i_(i) {}
};
-constexpr bool operator >= ( const X &lhs, const X &rhs )
- { return lhs.i_ >= rhs.i_ ; }
+constexpr bool operator>=(const X& lhs, const X& rhs) {
+ return lhs.i_ >= rhs.i_;
+}
-int main()
-{
- {
+int main() {
+ {
typedef optional<X> O;
- constexpr O o1; // disengaged
- constexpr O o2; // disengaged
- constexpr O o3{1}; // engaged
- constexpr O o4{2}; // engaged
- constexpr O o5{1}; // engaged
-
- static_assert ( (o1 >= o1), "" );
- static_assert ( (o1 >= o2), "" );
- static_assert ( !(o1 >= o3), "" );
- static_assert ( !(o1 >= o4), "" );
- static_assert ( !(o1 >= o5), "" );
-
- static_assert ( (o2 >= o1), "" );
- static_assert ( (o2 >= o2), "" );
- static_assert ( !(o2 >= o3), "" );
- static_assert ( !(o2 >= o4), "" );
- static_assert ( !(o2 >= o5), "" );
-
- static_assert ( (o3 >= o1), "" );
- static_assert ( (o3 >= o2), "" );
- static_assert ( (o3 >= o3), "" );
- static_assert ( !(o3 >= o4), "" );
- static_assert ( (o3 >= o5), "" );
-
- static_assert ( (o4 >= o1), "" );
- static_assert ( (o4 >= o2), "" );
- static_assert ( (o4 >= o3), "" );
- static_assert ( (o4 >= o4), "" );
- static_assert ( (o4 >= o5), "" );
-
- static_assert ( (o5 >= o1), "" );
- static_assert ( (o5 >= o2), "" );
- static_assert ( (o5 >= o3), "" );
- static_assert ( !(o5 >= o4), "" );
- static_assert ( (o5 >= o5), "" );
- }
+ constexpr O o1; // disengaged
+ constexpr O o2; // disengaged
+ constexpr O o3{1}; // engaged
+ constexpr O o4{2}; // engaged
+ constexpr O o5{1}; // engaged
+
+ static_assert((o1 >= o1), "");
+ static_assert((o1 >= o2), "");
+ static_assert(!(o1 >= o3), "");
+ static_assert(!(o1 >= o4), "");
+ static_assert(!(o1 >= o5), "");
+
+ static_assert((o2 >= o1), "");
+ static_assert((o2 >= o2), "");
+ static_assert(!(o2 >= o3), "");
+ static_assert(!(o2 >= o4), "");
+ static_assert(!(o2 >= o5), "");
+
+ static_assert((o3 >= o1), "");
+ static_assert((o3 >= o2), "");
+ static_assert((o3 >= o3), "");
+ static_assert(!(o3 >= o4), "");
+ static_assert((o3 >= o5), "");
+
+ static_assert((o4 >= o1), "");
+ static_assert((o4 >= o2), "");
+ static_assert((o4 >= o3), "");
+ static_assert((o4 >= o4), "");
+ static_assert((o4 >= o5), "");
+
+ static_assert((o5 >= o1), "");
+ static_assert((o5 >= o2), "");
+ static_assert((o5 >= o3), "");
+ static_assert(!(o5 >= o4), "");
+ static_assert((o5 >= o5), "");
+ }
+ {
+ using O1 = optional<int>;
+ using O2 = optional<long>;
+ constexpr O1 o1(42);
+ static_assert(o1 >= O2(42), "");
+ static_assert(!(O2(11) >= o1), "");
+ }
+ {
+ using O1 = optional<int>;
+ using O2 = optional<const int>;
+ constexpr O1 o1(42);
+ static_assert(o1 >= O2(42), "");
+ static_assert(!(O2(1) >= o1), "");
+ }
}
Modified:
libcxx/trunk/test/std/utilities/optional/optional.relops/greater_than.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/optional/optional.relops/greater_than.pass.cpp?rev=299105&r1=299104&r2=299105&view=diff
==============================================================================
---
libcxx/trunk/test/std/utilities/optional/optional.relops/greater_than.pass.cpp
(original)
+++
libcxx/trunk/test/std/utilities/optional/optional.relops/greater_than.pass.cpp
Thu Mar 30 15:06:52 2017
@@ -16,55 +16,66 @@
using std::optional;
-struct X
-{
- int i_;
+struct X {
+ int i_;
- constexpr X(int i) : i_(i) {}
+ constexpr X(int i) : i_(i) {}
};
-constexpr bool operator > ( const X &lhs, const X &rhs )
- { return lhs.i_ > rhs.i_ ; }
+constexpr bool operator>(const X& lhs, const X& rhs) { return lhs.i_ > rhs.i_;
}
-int main()
-{
- {
+int main() {
+ {
typedef optional<X> O;
- constexpr O o1; // disengaged
- constexpr O o2; // disengaged
- constexpr O o3{1}; // engaged
- constexpr O o4{2}; // engaged
- constexpr O o5{1}; // engaged
-
- static_assert ( !(o1 > o1), "" );
- static_assert ( !(o1 > o2), "" );
- static_assert ( !(o1 > o3), "" );
- static_assert ( !(o1 > o4), "" );
- static_assert ( !(o1 > o5), "" );
-
- static_assert ( !(o2 > o1), "" );
- static_assert ( !(o2 > o2), "" );
- static_assert ( !(o2 > o3), "" );
- static_assert ( !(o2 > o4), "" );
- static_assert ( !(o2 > o5), "" );
-
- static_assert ( (o3 > o1), "" );
- static_assert ( (o3 > o2), "" );
- static_assert ( !(o3 > o3), "" );
- static_assert ( !(o3 > o4), "" );
- static_assert ( !(o3 > o5), "" );
-
- static_assert ( (o4 > o1), "" );
- static_assert ( (o4 > o2), "" );
- static_assert ( (o4 > o3), "" );
- static_assert ( !(o4 > o4), "" );
- static_assert ( (o4 > o5), "" );
-
- static_assert ( (o5 > o1), "" );
- static_assert ( (o5 > o2), "" );
- static_assert ( !(o5 > o3), "" );
- static_assert ( !(o5 > o4), "" );
- static_assert ( !(o5 > o5), "" );
- }
+ constexpr O o1; // disengaged
+ constexpr O o2; // disengaged
+ constexpr O o3{1}; // engaged
+ constexpr O o4{2}; // engaged
+ constexpr O o5{1}; // engaged
+
+ static_assert(!(o1 > o1), "");
+ static_assert(!(o1 > o2), "");
+ static_assert(!(o1 > o3), "");
+ static_assert(!(o1 > o4), "");
+ static_assert(!(o1 > o5), "");
+
+ static_assert(!(o2 > o1), "");
+ static_assert(!(o2 > o2), "");
+ static_assert(!(o2 > o3), "");
+ static_assert(!(o2 > o4), "");
+ static_assert(!(o2 > o5), "");
+
+ static_assert((o3 > o1), "");
+ static_assert((o3 > o2), "");
+ static_assert(!(o3 > o3), "");
+ static_assert(!(o3 > o4), "");
+ static_assert(!(o3 > o5), "");
+
+ static_assert((o4 > o1), "");
+ static_assert((o4 > o2), "");
+ static_assert((o4 > o3), "");
+ static_assert(!(o4 > o4), "");
+ static_assert((o4 > o5), "");
+
+ static_assert((o5 > o1), "");
+ static_assert((o5 > o2), "");
+ static_assert(!(o5 > o3), "");
+ static_assert(!(o5 > o4), "");
+ static_assert(!(o5 > o5), "");
+ }
+ {
+ using O1 = optional<int>;
+ using O2 = optional<long>;
+ constexpr O1 o1(42);
+ static_assert(o1 > O2(1), "");
+ static_assert(!(O2(42) > o1), "");
+ }
+ {
+ using O1 = optional<int>;
+ using O2 = optional<const int>;
+ constexpr O1 o1(42);
+ static_assert(o1 > O2(1), "");
+ static_assert(!(O2(42) > o1), "");
+ }
}
Modified:
libcxx/trunk/test/std/utilities/optional/optional.relops/less_equal.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/optional/optional.relops/less_equal.pass.cpp?rev=299105&r1=299104&r2=299105&view=diff
==============================================================================
---
libcxx/trunk/test/std/utilities/optional/optional.relops/less_equal.pass.cpp
(original)
+++
libcxx/trunk/test/std/utilities/optional/optional.relops/less_equal.pass.cpp
Thu Mar 30 15:06:52 2017
@@ -16,55 +16,68 @@
using std::optional;
-struct X
-{
- int i_;
+struct X {
+ int i_;
- constexpr X(int i) : i_(i) {}
+ constexpr X(int i) : i_(i) {}
};
-constexpr bool operator <= ( const X &lhs, const X &rhs )
- { return lhs.i_ <= rhs.i_ ; }
+constexpr bool operator<=(const X& lhs, const X& rhs) {
+ return lhs.i_ <= rhs.i_;
+}
-int main()
-{
- {
+int main() {
+ {
typedef optional<X> O;
- constexpr O o1; // disengaged
- constexpr O o2; // disengaged
- constexpr O o3{1}; // engaged
- constexpr O o4{2}; // engaged
- constexpr O o5{1}; // engaged
-
- static_assert ( (o1 <= o1), "" );
- static_assert ( (o1 <= o2), "" );
- static_assert ( (o1 <= o3), "" );
- static_assert ( (o1 <= o4), "" );
- static_assert ( (o1 <= o5), "" );
-
- static_assert ( (o2 <= o1), "" );
- static_assert ( (o2 <= o2), "" );
- static_assert ( (o2 <= o3), "" );
- static_assert ( (o2 <= o4), "" );
- static_assert ( (o2 <= o5), "" );
-
- static_assert ( !(o3 <= o1), "" );
- static_assert ( !(o3 <= o2), "" );
- static_assert ( (o3 <= o3), "" );
- static_assert ( (o3 <= o4), "" );
- static_assert ( (o3 <= o5), "" );
-
- static_assert ( !(o4 <= o1), "" );
- static_assert ( !(o4 <= o2), "" );
- static_assert ( !(o4 <= o3), "" );
- static_assert ( (o4 <= o4), "" );
- static_assert ( !(o4 <= o5), "" );
-
- static_assert ( !(o5 <= o1), "" );
- static_assert ( !(o5 <= o2), "" );
- static_assert ( (o5 <= o3), "" );
- static_assert ( (o5 <= o4), "" );
- static_assert ( (o5 <= o5), "" );
- }
+ constexpr O o1; // disengaged
+ constexpr O o2; // disengaged
+ constexpr O o3{1}; // engaged
+ constexpr O o4{2}; // engaged
+ constexpr O o5{1}; // engaged
+
+ static_assert((o1 <= o1), "");
+ static_assert((o1 <= o2), "");
+ static_assert((o1 <= o3), "");
+ static_assert((o1 <= o4), "");
+ static_assert((o1 <= o5), "");
+
+ static_assert((o2 <= o1), "");
+ static_assert((o2 <= o2), "");
+ static_assert((o2 <= o3), "");
+ static_assert((o2 <= o4), "");
+ static_assert((o2 <= o5), "");
+
+ static_assert(!(o3 <= o1), "");
+ static_assert(!(o3 <= o2), "");
+ static_assert((o3 <= o3), "");
+ static_assert((o3 <= o4), "");
+ static_assert((o3 <= o5), "");
+
+ static_assert(!(o4 <= o1), "");
+ static_assert(!(o4 <= o2), "");
+ static_assert(!(o4 <= o3), "");
+ static_assert((o4 <= o4), "");
+ static_assert(!(o4 <= o5), "");
+
+ static_assert(!(o5 <= o1), "");
+ static_assert(!(o5 <= o2), "");
+ static_assert((o5 <= o3), "");
+ static_assert((o5 <= o4), "");
+ static_assert((o5 <= o5), "");
+ }
+ {
+ using O1 = optional<int>;
+ using O2 = optional<long>;
+ constexpr O1 o1(42);
+ static_assert(o1 <= O2(42), "");
+ static_assert(!(O2(101) <= o1), "");
+ }
+ {
+ using O1 = optional<int>;
+ using O2 = optional<const int>;
+ constexpr O1 o1(42);
+ static_assert(o1 <= O2(42), "");
+ static_assert(!(O2(101) <= o1), "");
+ }
}
Modified:
libcxx/trunk/test/std/utilities/optional/optional.relops/less_than.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/optional/optional.relops/less_than.pass.cpp?rev=299105&r1=299104&r2=299105&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/optional/optional.relops/less_than.pass.cpp
(original)
+++ libcxx/trunk/test/std/utilities/optional/optional.relops/less_than.pass.cpp
Thu Mar 30 15:06:52 2017
@@ -16,55 +16,66 @@
using std::optional;
-struct X
-{
- int i_;
+struct X {
+ int i_;
- constexpr X(int i) : i_(i) {}
+ constexpr X(int i) : i_(i) {}
};
-constexpr bool operator < ( const X &lhs, const X &rhs )
- { return lhs.i_ < rhs.i_ ; }
+constexpr bool operator<(const X& lhs, const X& rhs) { return lhs.i_ < rhs.i_;
}
-int main()
-{
- {
+int main() {
+ {
typedef optional<X> O;
- constexpr O o1; // disengaged
- constexpr O o2; // disengaged
- constexpr O o3{1}; // engaged
- constexpr O o4{2}; // engaged
- constexpr O o5{1}; // engaged
-
- static_assert ( !(o1 < o1), "" );
- static_assert ( !(o1 < o2), "" );
- static_assert ( (o1 < o3), "" );
- static_assert ( (o1 < o4), "" );
- static_assert ( (o1 < o5), "" );
-
- static_assert ( !(o2 < o1), "" );
- static_assert ( !(o2 < o2), "" );
- static_assert ( (o2 < o3), "" );
- static_assert ( (o2 < o4), "" );
- static_assert ( (o2 < o5), "" );
-
- static_assert ( !(o3 < o1), "" );
- static_assert ( !(o3 < o2), "" );
- static_assert ( !(o3 < o3), "" );
- static_assert ( (o3 < o4), "" );
- static_assert ( !(o3 < o5), "" );
-
- static_assert ( !(o4 < o1), "" );
- static_assert ( !(o4 < o2), "" );
- static_assert ( !(o4 < o3), "" );
- static_assert ( !(o4 < o4), "" );
- static_assert ( !(o4 < o5), "" );
-
- static_assert ( !(o5 < o1), "" );
- static_assert ( !(o5 < o2), "" );
- static_assert ( !(o5 < o3), "" );
- static_assert ( (o5 < o4), "" );
- static_assert ( !(o5 < o5), "" );
- }
+ constexpr O o1; // disengaged
+ constexpr O o2; // disengaged
+ constexpr O o3{1}; // engaged
+ constexpr O o4{2}; // engaged
+ constexpr O o5{1}; // engaged
+
+ static_assert(!(o1 < o1), "");
+ static_assert(!(o1 < o2), "");
+ static_assert((o1 < o3), "");
+ static_assert((o1 < o4), "");
+ static_assert((o1 < o5), "");
+
+ static_assert(!(o2 < o1), "");
+ static_assert(!(o2 < o2), "");
+ static_assert((o2 < o3), "");
+ static_assert((o2 < o4), "");
+ static_assert((o2 < o5), "");
+
+ static_assert(!(o3 < o1), "");
+ static_assert(!(o3 < o2), "");
+ static_assert(!(o3 < o3), "");
+ static_assert((o3 < o4), "");
+ static_assert(!(o3 < o5), "");
+
+ static_assert(!(o4 < o1), "");
+ static_assert(!(o4 < o2), "");
+ static_assert(!(o4 < o3), "");
+ static_assert(!(o4 < o4), "");
+ static_assert(!(o4 < o5), "");
+
+ static_assert(!(o5 < o1), "");
+ static_assert(!(o5 < o2), "");
+ static_assert(!(o5 < o3), "");
+ static_assert((o5 < o4), "");
+ static_assert(!(o5 < o5), "");
+ }
+ {
+ using O1 = optional<int>;
+ using O2 = optional<long>;
+ constexpr O1 o1(42);
+ static_assert(o1 < O2(101), "");
+ static_assert(!(O2(101) < o1), "");
+ }
+ {
+ using O1 = optional<int>;
+ using O2 = optional<const int>;
+ constexpr O1 o1(42);
+ static_assert(o1 < O2(101), "");
+ static_assert(!(O2(101) < o1), "");
+ }
}
Modified:
libcxx/trunk/test/std/utilities/optional/optional.relops/not_equal.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/optional/optional.relops/not_equal.pass.cpp?rev=299105&r1=299104&r2=299105&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/optional/optional.relops/not_equal.pass.cpp
(original)
+++ libcxx/trunk/test/std/utilities/optional/optional.relops/not_equal.pass.cpp
Thu Mar 30 15:06:52 2017
@@ -18,57 +18,69 @@
using std::optional;
-struct X
-{
- int i_;
+struct X {
+ int i_;
- constexpr X(int i) : i_(i) {}
+ constexpr X(int i) : i_(i) {}
};
-constexpr bool operator != ( const X &lhs, const X &rhs )
- { return lhs.i_ != rhs.i_ ; }
+constexpr bool operator!=(const X& lhs, const X& rhs) {
+ return lhs.i_ != rhs.i_;
+}
-int main()
-{
- {
+int main() {
+ {
typedef X T;
typedef optional<T> O;
- constexpr O o1; // disengaged
- constexpr O o2; // disengaged
- constexpr O o3{1}; // engaged
- constexpr O o4{2}; // engaged
- constexpr O o5{1}; // engaged
-
- static_assert ( !(o1 != o1), "" );
- static_assert ( !(o1 != o2), "" );
- static_assert ( (o1 != o3), "" );
- static_assert ( (o1 != o4), "" );
- static_assert ( (o1 != o5), "" );
-
- static_assert ( !(o2 != o1), "" );
- static_assert ( !(o2 != o2), "" );
- static_assert ( (o2 != o3), "" );
- static_assert ( (o2 != o4), "" );
- static_assert ( (o2 != o5), "" );
-
- static_assert ( (o3 != o1), "" );
- static_assert ( (o3 != o2), "" );
- static_assert ( !(o3 != o3), "" );
- static_assert ( (o3 != o4), "" );
- static_assert ( !(o3 != o5), "" );
-
- static_assert ( (o4 != o1), "" );
- static_assert ( (o4 != o2), "" );
- static_assert ( (o4 != o3), "" );
- static_assert ( !(o4 != o4), "" );
- static_assert ( (o4 != o5), "" );
-
- static_assert ( (o5 != o1), "" );
- static_assert ( (o5 != o2), "" );
- static_assert ( !(o5 != o3), "" );
- static_assert ( (o5 != o4), "" );
- static_assert ( !(o5 != o5), "" );
-
- }
+ constexpr O o1; // disengaged
+ constexpr O o2; // disengaged
+ constexpr O o3{1}; // engaged
+ constexpr O o4{2}; // engaged
+ constexpr O o5{1}; // engaged
+
+ static_assert(!(o1 != o1), "");
+ static_assert(!(o1 != o2), "");
+ static_assert((o1 != o3), "");
+ static_assert((o1 != o4), "");
+ static_assert((o1 != o5), "");
+
+ static_assert(!(o2 != o1), "");
+ static_assert(!(o2 != o2), "");
+ static_assert((o2 != o3), "");
+ static_assert((o2 != o4), "");
+ static_assert((o2 != o5), "");
+
+ static_assert((o3 != o1), "");
+ static_assert((o3 != o2), "");
+ static_assert(!(o3 != o3), "");
+ static_assert((o3 != o4), "");
+ static_assert(!(o3 != o5), "");
+
+ static_assert((o4 != o1), "");
+ static_assert((o4 != o2), "");
+ static_assert((o4 != o3), "");
+ static_assert(!(o4 != o4), "");
+ static_assert((o4 != o5), "");
+
+ static_assert((o5 != o1), "");
+ static_assert((o5 != o2), "");
+ static_assert(!(o5 != o3), "");
+ static_assert((o5 != o4), "");
+ static_assert(!(o5 != o5), "");
+ }
+ {
+ using O1 = optional<int>;
+ using O2 = optional<long>;
+ constexpr O1 o1(42);
+ static_assert(o1 != O2(101), "");
+ static_assert(!(O2(42) != o1), "");
+ }
+ {
+ using O1 = optional<int>;
+ using O2 = optional<const int>;
+ constexpr O1 o1(42);
+ static_assert(o1 != O2(101), "");
+ static_assert(!(O2(42) != o1), "");
+ }
}
Modified: libcxx/trunk/www/cxx1z_status.html
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/www/cxx1z_status.html?rev=299105&r1=299104&r2=299105&view=diff
==============================================================================
--- libcxx/trunk/www/cxx1z_status.html (original)
+++ libcxx/trunk/www/cxx1z_status.html Thu Mar 30 15:06:52 2017
@@ -482,7 +482,7 @@
<tr><td><a href="http://wg21.link/LWG2908";>2908</a></td><td>The
less-than operator for shared pointers could do
more</td><td>Kona</td><td></td></tr>
<tr><td><a href="http://wg21.link/LWG2911";>2911</a></td><td>An
is_aggregate type trait is needed</td><td>Kona</td><td></td></tr>
<tr><td><a
href="http://wg21.link/LWG2921";>2921</a></td><td>packaged_task and type-erased
allocators</td><td>Kona</td><td></td></tr>
- <tr><td><a
href="http://wg21.link/LWG2934";>2934</a></td><td>optional<const T>
doesn't compare with T</td><td>Kona</td><td></td></tr>
+ <tr><td><a
href="http://wg21.link/LWG2934";>2934</a></td><td>optional<const T>
doesn't compare with T</td><td>Kona</td><td>Complete</td></tr>
<!--
<tr><td><a
href="http://wg21.link/LWG1214";>1214</a></td><td>Insufficient/inconsistent key
immutability requirements for associative
containers</td><td>Urbana</td><td></td></tr>
-->
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
