Changes in libcfa/src/collections/string.cfa [416b443:737988b]

File:

• libcfa/src/collections/string.cfa (modified) (1 diff)

libcfa/src/collections/string.cfa

@@ -157 +157 @@
 // Comparison
 
-int  cmp (const string &s1, const string &s2) { return cmp(*s1.inner ,  *s2.inner); }
-bool ?==?(const string &s1, const string &s2) { return     *s1.inner == *s2.inner ; }
-bool ?!=?(const string &s1, const string &s2) { return     *s1.inner != *s2.inner ; }
-bool ?>? (const string &s1, const string &s2) { return     *s1.inner >  *s2.inner ; }
-bool ?>=?(const string &s1, const string &s2) { return     *s1.inner >= *s2.inner ; }
-bool ?<=?(const string &s1, const string &s2) { return     *s1.inner <= *s2.inner ; }
-bool ?<? (const string &s1, const string &s2) { return     *s1.inner <  *s2.inner ; }
-
-int  cmp (const string &s1, const char*   s2) { return cmp(*s1.inner ,   s2      ); }
-bool ?==?(const string &s1, const char*   s2) { return     *s1.inner ==  s2       ; }
-bool ?!=?(const string &s1, const char*   s2) { return     *s1.inner !=  s2       ; }
-bool ?>? (const string &s1, const char*   s2) { return     *s1.inner >   s2       ; }
-bool ?>=?(const string &s1, const char*   s2) { return     *s1.inner >=  s2       ; }
-bool ?<=?(const string &s1, const char*   s2) { return     *s1.inner <=  s2       ; }
-bool ?<? (const string &s1, const char*   s2) { return     *s1.inner <   s2       ; }
-
-int  cmp (const char*   s1, const string &s2) { return cmp( s1       ,  *s2.inner); }
-bool ?==?(const char*   s1, const string &s2) { return      s1       == *s2.inner ; }
-bool ?!=?(const char*   s1, const string &s2) { return      s1       != *s2.inner ; }
-bool ?>? (const char*   s1, const string &s2) { return      s1       >  *s2.inner ; }
-bool ?>=?(const char*   s1, const string &s2) { return      s1       >= *s2.inner ; }
-bool ?<=?(const char*   s1, const string &s2) { return      s1       <= *s2.inner ; }
-bool ?<? (const char*   s1, const string &s2) { return      s1       <  *s2.inner ; }
-
+bool ?==?(const string & s, const string & other) {
+    return *s.inner == *other.inner;
+}
+
+bool ?!=?(const string & s, const string & other) {
+    return *s.inner != *other.inner;
+}
+
+bool ?==?(const string & s, const char * other) {
+    return *s.inner == other;
+}
+
+bool ?!=?(const string & s, const char * other) {
+    return *s.inner != other;
+}
 
 ////////////////////////////////////////////////////////