Changeset 1668862 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

71f713a

Parents:

09416c12

git-author:

Dzejrou <dzejrou@…> (2018-05-18 17:44:03)

git-committer:

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

Message:

cpp: fixed std::equal, it used the iterators as if they were random access iterator, which they don't have to be

File:

• uspace/lib/cpp/include/impl/algorithm.hpp (modified) (8 diffs)

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

@@ -224 +224 @@
                                                   InputIterator2 first2)
     {
-        while (first1 != last1 && *first1++ == *first2++)
-        { /* DUMMY BODY */ }
+        while (first1 != last1 && *first1 == *first2)
+        {
+            ++first1;
+            ++first2;
+        }
 
         return make_pair(first1, first2);
@@ -234 +237 @@
                                                   InputIterator2 first2, BinaryPredicate pred)
     {
-        while (first1 != last1 && pred(*first1++, *first2++))
-        { /* DUMMY BODY */ }
+        while (first1 != last1 && pred(*first1, *first2))
+        {
+            ++first1;
+            ++first2;
+        }
 
         return make_pair(first1, first2);
@@ -244 +250 @@
                                                   InputIterator2 first2, InputIterator2 last2)
     {
-        while (first1 != last1 && first2 != last2 && *first1++ == *first2++)
-        { /* DUMMY BODY */ }
+        while (first1 != last1 && first2 != last2 && *first1 == *first2)
+        {
+            ++first1;
+            ++first2;
+        }
 
         return make_pair(first1, first2);
@@ -255 +264 @@
                                                   BinaryPredicate pred)
     {
-        while (first1 != last1 && first2 != last2 && pred(*first1++, *first2++))
-        { /* DUMMY BODY */ }
+        while (first1 != last1 && first2 != last2 && pred(*first1, *first2))
+        {
+            ++first1;
+            ++first2;
+        }
 
         return make_pair(first1, first2);
@@ -268 +280 @@
     bool equal(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2)
     {
-        auto last2 = first2 + (last1 - first1);
-
-        return equal(first1, last1, first2, last2);
+        while (first1 != last1)
+        {
+            if (*first1++ != *first2++)
+                return false;
+        }
+
+        return true;
     }
 
@@ -277 +293 @@
                InputIterator2 first2, InputIterator2 last2)
     {
-        if ((last1 - first1) != (last2 - first2))
-            return false;
-
-        while (first1 != last1)
+        while (first1 != last1 && first2 != last2)
         {
             if (*first1++ != *first2++)
@@ -293 +306 @@
                InputIterator2 first2, BinaryPredicate pred)
     {
-        auto last2 = first2 + (last1 - first1);
-
-        return equal(first1, last1, first2, last2, pred);
+        while (first1 != last1)
+        {
+            if (!pred(*first1++, *first2++))
+                return false;
+        }
+
+        return true;
     }
 
@@ -303 +320 @@
                BinaryPredicate pred)
     {
-        if ((last1 - first1) != (last2 - first2))
-            return false;
-
-        while (first1 != last1)
+        while (first1 != last1 && first2 != last2)
         {
             if (!pred(*first1++, *first2++))