Disambiguate PString (in)equality operators

Otherwise when compiling ptlib consumer code with C++ 20 compilation fails.
willamowius · Jan 19, 2022 · 69d261b · 69d261b
1 parent e34ada8
commit 69d261b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/include/ptlib/contain.inl b/include/ptlib/contain.inl
@@ -116,9 +116,15 @@ PINLINE PString & PString::operator&=(const PString & str)
 PINLINE bool PString::operator==(const PObject & obj) const
   { return PObject::operator==(obj); }
 
+PINLINE bool PString::operator==(const PString & obj) const
+  { return PObject::operator==(obj); }
+
 PINLINE bool PString::operator!=(const PObject & obj) const
   { return PObject::operator!=(obj); }
 
+PINLINE bool PString::operator!=(const PString & obj) const
+  { return PObject::operator!=(obj); }
+
 PINLINE bool PString::operator<(const PObject & obj) const
   { return PObject::operator<(obj); }
 

diff --git a/include/ptlib/pstring.h b/include/ptlib/pstring.h
@@ -828,6 +828,17 @@ class PString : public PCharArray
       const PObject & str  ///< PString object to compare against.
     ) const;
 
+    /**Compare two strings using the <code>PObject::Compare()</code> function. This
+       is identical to the <code>PObject</code> class function but is necessary due
+       to other overloaded versions.
+
+       @return
+       true if equal.
+     */
+    bool operator==(
+      const PString & str  ///< PString object to compare against.
+    ) const;
+
     /**Compare two strings using the <code>PObject::Compare()</code> function. This
        is identical to the <code>PObject</code> class function but is necessary due
        to other overloaded versions.
@@ -839,6 +850,17 @@ class PString : public PCharArray
       const PObject & str  ///< PString object to compare against.
     ) const;
 
+    /**Compare two strings using the <code>PObject::Compare()</code> function. This
+       is identical to the <code>PObject</code> class function but is necessary due
+       to other overloaded versions.
+
+       @return
+       true if not equal.
+     */
+    bool operator!=(
+      const PString & str  ///< PString object to compare against.
+    ) const;
+
     /**Compare two strings using the <code>PObject::Compare()</code> function. This
        is identical to the <code>PObject</code> class function but is necessary due
        to other overloaded versions.