Changeset 07eaeea in mainline for uspace/lib/cpp/include/__bits/adt/hash_table.hpp

Timestamp:

2018-07-05T21:41:25Z (7 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

3ae7827

Parents:

65ee021

git-author:

Dzejrou <dzejrou@…> (2018-07-03 18:04:10)

git-committer:

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

Message:

cpp: fixed unordered_map tests on ppc32 and sparc64, added additional checks to make sure the programs don't fail

File:

• uspace/lib/cpp/include/__bits/adt/hash_table.hpp (modified) (3 diffs)

uspace/lib/cpp/include/__bits/adt/hash_table.hpp

@@ -212 +212 @@
             iterator erase(const_iterator it)
             {
+                if (it == cend())
+                    return end();
+
                 auto node = it.node();
                 auto idx = it.idx();
@@ -234 +237 @@
                 delete node;
 
-                return res;
+                if (empty())
+                    return end();
+                else
+                    return res;
             }
 
@@ -282 +288 @@
                     current = current->next;
                 }
-                while (current != head);
+                while (current && current != head);
 
                 return end();