Changeset f4a42661 in mainline for uspace/lib/cpp/include/__bits/adt

Timestamp:

2023-10-22T14:04:49Z (2 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

590cb6d2

Parents:

b2cbc0b (diff), c63c2bb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge fixes to issues found while updating toolchain

Location:

uspace/lib/cpp/include/__bits/adt

Files:

• hash_table.hpp (modified) (1 diff)
• rbtree.hpp (modified) (1 diff)

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

@@ -252 +252 @@
             void swap(hash_table& other)
                 noexcept(allocator_traits<allocator_type>::is_always_equal::value &&
-                         noexcept(swap(declval<Hasher&>(), declval<Hasher&>())) &&
-                         noexcept(swap(declval<KeyEq&>(), declval<KeyEq&>())))
+                         noexcept(std::swap(declval<Hasher&>(), declval<Hasher&>())) &&
+                         noexcept(std::swap(declval<KeyEq&>(), declval<KeyEq&>())))
             {
                 std::swap(table_, other.table_);

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

@@ -233 +233 @@
             void swap(rbtree& other)
                 noexcept(allocator_traits<allocator_type>::is_always_equal::value &&
-                         noexcept(swap(declval<KeyComp&>(), declval<KeyComp&>())))
+                         noexcept(std::swap(declval<KeyComp&>(), declval<KeyComp&>())))
             {
                 std::swap(root_, other.root_);