diff --git a/rapidjson-1.1.0-c++20.patch b/rapidjson-1.1.0-c++20.patch deleted file mode 100644 index 9b10ae6..0000000 --- a/rapidjson-1.1.0-c++20.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit c6c56d87ff12ba8100b261f371fdaa106f95fe14 -Author: Tom Hughes -Date: Tue Sep 1 19:24:03 2020 +0100 - - Avoid ambiguous operator errors in C++20 - - Derived from upstream commit ebcbd04484fcdaddbb9fd7798e76bbfb4ae8f840 - -diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h -index e3e20dfb..1485321d 100644 ---- a/include/rapidjson/document.h -+++ b/include/rapidjson/document.h -@@ -168,12 +168,12 @@ public: - - //! @name relations - //@{ -- bool operator==(ConstIterator that) const { return ptr_ == that.ptr_; } -- bool operator!=(ConstIterator that) const { return ptr_ != that.ptr_; } -- bool operator<=(ConstIterator that) const { return ptr_ <= that.ptr_; } -- bool operator>=(ConstIterator that) const { return ptr_ >= that.ptr_; } -- bool operator< (ConstIterator that) const { return ptr_ < that.ptr_; } -- bool operator> (ConstIterator that) const { return ptr_ > that.ptr_; } -+ template bool operator==(const GenericMemberIterator& that) const { return ptr_ == that.ptr_; } -+ template bool operator!=(const GenericMemberIterator& that) const { return ptr_ != that.ptr_; } -+ template bool operator<=(const GenericMemberIterator& that) const { return ptr_ <= that.ptr_; } -+ template bool operator>=(const GenericMemberIterator& that) const { return ptr_ >= that.ptr_; } -+ template bool operator< (const GenericMemberIterator& that) const { return ptr_ < that.ptr_; } -+ template bool operator> (const GenericMemberIterator& that) const { return ptr_ > that.ptr_; } - //@} - - //! @name dereference