Changeset de00da5 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

6a3a64f

Parents:

09e02ee

git-author:

Dzejrou <dzejrou@…> (2018-05-09 23:42:29)

git-committer:

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

Message:

cpp: fixed enable_if usage, added payload_tag that allows us to properly construct smart pointers from payloads

Location:

uspace/lib/cpp/include/internal/memory

Files:

• shared_payload.hpp (modified) (1 diff)
• shared_ptr.hpp (modified) (13 diffs)
• weak_ptr.hpp (modified) (1 diff)

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

@@ -49 +49 @@
     using refcount_t = long;
 
+    /**
+     * This allows us to construct shared_ptr from
+     * a payload pointer in make_shared etc.
+     */
+    struct payload_tag_t
+    { /* DUMMY BODY */ };
+
+    inline constexpr payload_tag_t payload_tag{};
+
     template<class D, class T>
     void use_payload_deleter(D* deleter, T* data)

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

@@ -76 +76 @@
             template<class U>
             explicit shared_ptr(
-                enable_if_t<is_convertible_v<U*, element_type*>, U*> ptr
+                U* ptr,
+                enable_if_t<is_convertible_v<U*, element_type*>>* = nullptr
             )
                 : payload_{}, data_{ptr}
@@ -94 +95 @@
             template<class U, class D>
             shared_ptr(
-                enable_if_t<is_convertible_v<U*, element_type*>, U*> ptr, D deleter
+                U* ptr, D deleter,
+                enable_if_t<is_convertible_v<U*, element_type*>>* = nullptr
             )
                 : shared_ptr{}
@@ -112 +114 @@
             template<class U, class D, class A>
             shared_ptr(
-                enable_if_t<is_convertible_v<U*, element_type*>, U*> ptr,
-                D deleter, A
+                U* ptr, D deleter, A,
+                enable_if_t<is_convertible_v<U*, element_type*>>* = nullptr
             )
                 : shared_ptr{}
@@ -141 +143 @@
             template<class U>
             shared_ptr(
-                enable_if_t<is_convertible_v<U*, element_type*>, const shared_ptr<U>&> other,
-                element_type* ptr
+                const shared_ptr<U>& other, element_type* ptr,
+                enable_if_t<is_convertible_v<U*, element_type*>>* = nullptr
             )
                 : payload_{other.payload_}, data_{ptr}
@@ -159 +161 @@
             template<class U>
             shared_ptr(
-                enable_if_t<is_convertible_v<U*, element_type*>, const shared_ptr<U>&> other
+                const shared_ptr<U>& other,
+                enable_if_t<is_convertible_v<U*, element_type*>>* = nullptr
             )
                 : payload_{other.payload_}, data_{other.data_}
@@ -176 +179 @@
             template<class U>
             shared_ptr(
-                enable_if_t<is_convertible_v<U*, element_type*>, shared_ptr<U>&&> other
+                shared_ptr<U>&& other,
+                enable_if_t<is_convertible_v<U*, element_type*>>* = nullptr
             )
                 : payload_{move(other.payload_)}, data_{move(other.data_)}
@@ -186 +190 @@
             template<class U>
             explicit shared_ptr(
-                enable_if_t<is_convertible_v<U*, element_type*>, const weak_ptr<U>&> other
+                const weak_ptr<U>& other,
+                enable_if_t<is_convertible_v<U*, element_type*>>* = nullptr
             )
             {
@@ -196 +201 @@
             template<class U, class D>
             shared_ptr(
+                unique_ptr<U, D>&& other,
                 enable_if_t<
                     is_convertible_v<
                         typename unique_ptr<U, D>::pointer,
                         element_type*
-                    >,
-                    unique_ptr<U, D>&&
-                > other
+                    >
+                >* = nullptr
             ) // TODO: if D is a reference type, it should be ref(other.get_deleter())
                 : shared_ptr{other.release(), other.get_deleter()}
@@ -238 +243 @@
 
             template<class U>
-            shared_ptr& operator=(
-                enable_if_t<is_convertible_v<U*, element_type*>, const shared_ptr<U>&> rhs
-            ) noexcept
+            enable_if_t<is_convertible_v<U*, element_type*>, shared_ptr>&
+            operator=(const shared_ptr<U>& rhs) noexcept
             {
                 if (rhs.payload_)
@@ -261 +265 @@
 
             template<class U>
-            shared_ptr& operator=(
-                enable_if_t<is_convertible_v<U*, element_type*>, shared_ptr<U>&&> rhs
-            ) noexcept
+            shared_ptr& operator=(shared_ptr<U>&& rhs) noexcept
             {
                 shared_ptr{move(rhs)}.swap(*this);
@@ -364 +366 @@
             element_type* data_;
 
-            shared_ptr(aux::shared_payload_base<element_type>* payload)
+            shared_ptr(aux::payload_tag_t, aux::shared_payload_base<element_type>* payload)
                 : payload_{payload}, data_{payload->get()}
             { /* DUMMY BODY */ }
@@ -409 +411 @@
     {
         return shared_ptr<T>{
+            aux::payload_tag,
             new aux::shared_payload<T>{forward<Args>(args)...}
         };
@@ -417 +420 @@
     {
         return shared_ptr<T>{
+            aux::payload_tag,
             new aux::shared_payload<T>{allocator_arg, A{alloc}, forward<Args>(args)...}
         };

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

@@ -192 +192 @@
             shared_ptr<T> lock() const noexcept
             {
-                return shared_ptr{payload_->lock()};
+                return shared_ptr{aux::payload_tag, payload_->lock()};
             }