Merge pull request #1517 from atyuwen/master

fixed compile error with -std=c++20.
This commit is contained in:
Hans-Kristian Arntzen 2020-10-30 15:51:18 +01:00 committed by GitHub
commit 8884b34940
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -357,28 +357,6 @@ public:
return TypedID<U>(*this);
}
bool operator==(const TypedID &other) const
{
return id == other.id;
}
bool operator!=(const TypedID &other) const
{
return id != other.id;
}
template <Types type>
bool operator==(const TypedID<type> &other) const
{
return id == uint32_t(other);
}
template <Types type>
bool operator!=(const TypedID<type> &other) const
{
return id != uint32_t(other);
}
private:
uint32_t id = 0;
};
@ -403,26 +381,6 @@ public:
return id;
}
bool operator==(const TypedID &other) const
{
return id == other.id;
}
bool operator!=(const TypedID &other) const
{
return id != other.id;
}
bool operator==(const TypedID<TypeNone> &other) const
{
return id == uint32_t(other);
}
bool operator!=(const TypedID<TypeNone> &other) const
{
return id != uint32_t(other);
}
private:
uint32_t id = 0;
};