Fix errors in operator<, operator> of Utf8String, Utf16String (#1114)

TheAssemblyArmada · Feb 15, 2024 · c0efefe · c0efefe
1 parent 3caa927
commit c0efefe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/game/common/system/asciistring.h b/src/game/common/system/asciistring.h
@@ -161,15 +161,18 @@ class Utf8String
     friend bool operator==(Utf8String const &left, Utf8String const &right) { return left.Compare(right) == 0; }
     friend bool operator==(Utf8String const &left, const char *right) { return left.Compare(right) == 0; }
     friend bool operator==(const char *left, Utf8String const &right) { return right.Compare(left) == 0; }
+
     friend bool operator!=(Utf8String const &left, Utf8String const &right) { return left.Compare(right) != 0; }
     friend bool operator!=(Utf8String const &left, const char *right) { return left.Compare(right) != 0; }
     friend bool operator!=(const char *left, Utf8String const &right) { return right.Compare(left) != 0; }
+
     friend bool operator<(Utf8String const &left, Utf8String const &right) { return left.Compare(right) < 0; }
     friend bool operator<(Utf8String const &left, const char *right) { return left.Compare(right) < 0; }
-    friend bool operator<(const char *left, Utf8String const &right) { return right.Compare(left) >= 0; }
+    friend bool operator<(const char *left, Utf8String const &right) { return !(right.Compare(left) < 0); }
+
     friend bool operator>(Utf8String const &left, Utf8String const &right) { return left.Compare(right) > 0; }
-    friend bool operator>(Utf8String const &left, const char *right) { return left.Compare(right) < 0; }
-    friend bool operator>(const char *left, Utf8String const &right) { return right.Compare(left) >= 0; }
+    friend bool operator>(Utf8String const &left, const char *right) { return left.Compare(right) > 0; }
+    friend bool operator>(const char *left, Utf8String const &right) { return !(right.Compare(left) > 0); }
 
     friend Utf8String operator+(const Utf8String &a, const Utf8String &b)
     {

diff --git a/src/game/common/system/unicodestring.h b/src/game/common/system/unicodestring.h
@@ -171,11 +171,11 @@ class Utf16String
 
     friend bool operator<(Utf16String const &left, Utf16String const &right) { return left.Compare(right) < 0; }
     friend bool operator<(Utf16String const &left, const unichar_t *right) { return left.Compare(right) < 0; }
-    friend bool operator<(const unichar_t *left, Utf16String const &right) { return right.Compare(left) < 0; }
+    friend bool operator<(const unichar_t *left, Utf16String const &right) { return !(right.Compare(left) < 0); }
 
     friend bool operator>(Utf16String const &left, Utf16String const &right) { return left.Compare(right) > 0; }
     friend bool operator>(Utf16String const &left, const unichar_t *right) { return left.Compare(right) > 0; }
-    friend bool operator>(const unichar_t *left, Utf16String const &right) { return right.Compare(left) > 0; }
+    friend bool operator>(const unichar_t *left, Utf16String const &right) { return !(right.Compare(left) > 0); }
 
 public:
     static Utf16String const s_emptyString;