Changeset f4a42661 in mainline for uspace/lib/cpp

Timestamp:

2023-10-22T14:04:49Z (21 months 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

Files:

• include/__bits/adt/hash_table.hpp (modified) (1 diff)
• include/__bits/adt/rbtree.hpp (modified) (1 diff)
• include/__bits/string/string.hpp (modified) (2 diffs)
• src/__bits/unwind.cpp (modified) (1 diff)
• src/future.cpp (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_);

uspace/lib/cpp/include/__bits/string/string.hpp

@@ -521 +521 @@
 
             basic_string(size_type n, value_type c, const allocator_type& alloc = allocator_type{})
-                : data_{}, size_{n}, capacity_{n}, allocator_{alloc}
+                : data_{}, size_{n}, capacity_{n + 1}, allocator_{alloc}
             {
                 data_ = allocator_.allocate(capacity_);
@@ -908 +908 @@
             {
                 // TODO: if (n > max_size()) throw length_error.
-                resize_without_copy_(n);
+                resize_without_copy_(n + 1);
                 traits_type::copy(begin(), str, n);
                 size_ = n;

uspace/lib/cpp/src/__bits/unwind.cpp

@@ -30 +30 @@
 #include <cstdint>
 #include <cstdlib>
+#include <typeinfo>
 
 namespace __cxxabiv1

uspace/lib/cpp/src/future.cpp

@@ -84 +84 @@
     const char* future_error::what() const noexcept
     {
-        return code().message().c_str();
+        /*
+         * FIXME
+         * Following code would be optimal but the message string is
+         * actually destroyed before the function returns so we would
+         * be returning a dangling pointer. No simple fix available, hence
+         * we use the ugly hack.
+         */
+        //return code().message().c_str();
+#define QUOTE_ARG(arg) #arg
+        return "future_error, see " __FILE__ ":" QUOTE_ARG(__LINE__);
     }
 }