Changeset 8921188 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

4529c4b

Parents:

edd2e61

git-author:

Dzejrou <dzejrou@…> (2018-05-11 00:08:26)

git-committer:

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

Message:

cpp: added shared_ptr from weak_ptr constructor

File:

• uspace/lib/cpp/include/internal/memory/shared_ptr.hpp (modified) (2 diffs)

uspace/lib/cpp/include/internal/memory/shared_ptr.hpp

@@ -35 +35 @@
 #include <internal/memory/allocator_arg.hpp>
 #include <internal/memory/shared_payload.hpp>
+#include <internal/trycatch.hpp>
 #include <type_traits>
 
@@ -194 +195 @@
                 enable_if_t<is_convertible_v<U*, element_type*>>* = nullptr
             )
+                : payload_{}, data_{}
             {
                 if (other.expired())
                     throw bad_weak_ptr{};
-                // TODO:
+
+                if (other.payload_)
+                {
+                    payload_ = other.payload_->lock();
+                    data_ = payload_->get();
+                }
             }