Changeset d276424f in mainline

Timestamp:

2019-07-02T13:08:59Z (6 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

d3ba97d

Parents:

5d71d09

Message:

cpp: fix allocators for promise and packaged_task

Location:

uspace/lib/cpp/include/__bits/thread

Files:

• packaged_task.hpp (modified) (1 diff)
• promise.hpp (modified) (1 diff)

uspace/lib/cpp/include/__bits/thread/packaged_task.hpp

@@ -77 +77 @@
                 : func_{forward<F>(f)}, state_{}
             {
-                auto rebound = allocator_traits<Allocator>::rebind<
-                    aux::shared_state<R>
-                >{a};
+                typename allocator_traits<
+                    Allocator
+                >::template rebind_alloc<aux::shared_state<R>> rebound{a};
 
                 state_ = rebound.allocate(1);

uspace/lib/cpp/include/__bits/thread/promise.hpp

@@ -57 +57 @@
                     : state_{}
                 {
-                    auto rebound = allocator_traits<Allocator>::rebind<
-                        aux::shared_state<R>
-                    >{a};
+                    typename allocator_traits<
+                        Allocator
+                    >::template rebind_alloc<aux::shared_state<R>> rebound{a};
 
                     state_ = rebound.allocate(1);