Fix LWG 2934 - optional<const T> doesn't compare with T
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@299105 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -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
|
||||
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(!(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(!(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((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((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), "" );
|
||||
|
||||
}
|
||||
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), "");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user