Changeset 026cb10 in mainline

Timestamp:

2018-07-05T21:41:22Z (6 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cf3b398

Parents:

26d2990

git-author:

Dzejrou <dzejrou@…> (2018-04-30 22:22:12)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:22)

Message:

cpp: added comparison operators for set and map

Location:

uspace/lib/cpp/include/impl

Files:

• map.hpp (modified) (8 diffs)
• set.hpp (modified) (8 diffs)

uspace/lib/cpp/include/impl/map.hpp

@@ -525 +525 @@
                    const map<Key, Compare, Allocator>& rhs)
     {
-        // TODO: need lexicographical_compare
-        return false;
+        return lexicographical_compare(
+            lhs.begin(), lhs.end(),
+            rhs.begin(), rhs.end(),
+            lhs.value_comp()
+        );
     }
 
@@ -540 +543 @@
                    const map<Key, Compare, Allocator>& rhs)
     {
-        // TODO: need lexicographical_compare
-        return false;
+        return rhs < lhs;
     }
 
@@ -548 +550 @@
                     const map<Key, Compare, Allocator>& rhs)
     {
-        // TODO: need lexicographical_compare
-        return false;
+        return !(lhs < rhs);
     }
 
@@ -556 +557 @@
                     const map<Key, Compare, Allocator>& rhs)
     {
-        // TODO: need lexicographical_compare
-        return false;
-    }
+        return !(rhs < lhs);
+    }
+
     /**
      * 23.4.5, class template multimap:
@@ -1030 +1031 @@
                    const multimap<Key, Compare, Allocator>& rhs)
     {
-        // TODO: need lexicographical_compare
-        return false;
+        return lexicographical_compare(
+            lhs.begin(), lhs.end(),
+            rhs.begin(), rhs.end(),
+            lhs.value_comp()
+        );
     }
 
@@ -1045 +1049 @@
                    const multimap<Key, Compare, Allocator>& rhs)
     {
-        // TODO: need lexicographical_compare
-        return false;
+        return rhs < lhs;
     }
 
@@ -1053 +1056 @@
                     const multimap<Key, Compare, Allocator>& rhs)
     {
-        // TODO: need lexicographical_compare
-        return false;
+        return !(lhs < rhs);
     }
 
@@ -1061 +1063 @@
                     const multimap<Key, Compare, Allocator>& rhs)
     {
-        // TODO: need lexicographical_compare
-        return false;
+        return !(rhs < lhs);
     }
 }

uspace/lib/cpp/include/impl/set.hpp

@@ -473 +473 @@
                    const set<Key, Compare, Allocator>& rhs)
     {
-        // TODO: need lexicographical_compare
-        return false;
+        return lexicographical_compare(
+            lhs.begin(), lhs.end(),
+            rhs.begin(), rhs.end(),
+            lhs.key_comp()
+        );
     }
 
@@ -488 +491 @@
                    const set<Key, Compare, Allocator>& rhs)
     {
-        // TODO: need lexicographical_compare
-        return false;
+        return rhs < lhs;
     }
 
@@ -496 +498 @@
                     const set<Key, Compare, Allocator>& rhs)
     {
-        // TODO: need lexicographical_compare
-        return false;
+        return !(lhs < rhs);
     }
 
@@ -504 +505 @@
                     const set<Key, Compare, Allocator>& rhs)
     {
-        // TODO: need lexicographical_compare
-        return false;
-    }
+        return !(rhs < lhs);
+    }
+
     /**
      * 23.4.7, class template multiset:
@@ -942 +943 @@
                    const multiset<Key, Compare, Allocator>& rhs)
     {
-        // TODO: need lexicographical_compare
-        return false;
+        return lexicographical_compare(
+            lhs.begin(), lhs.end(),
+            rhs.begin(), rhs.end(),
+            lhs.value_comp()
+        );
     }
 
@@ -957 +961 @@
                    const multiset<Key, Compare, Allocator>& rhs)
     {
-        // TODO: need lexicographical_compare
-        return false;
+        return rhs < lhs;
     }
 
@@ -965 +968 @@
                     const multiset<Key, Compare, Allocator>& rhs)
     {
-        // TODO: need lexicographical_compare
-        return false;
+        return !(lhs < rhs);
     }
 
@@ -973 +975 @@
                     const multiset<Key, Compare, Allocator>& rhs)
     {
-        // TODO: need lexicographical_compare
-        return false;
+        return !(rhs < lhs);
     }
 }