summaryrefslogtreecommitdiff
path: root/boost/asio/impl/use_future.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'boost/asio/impl/use_future.hpp')
-rw-r--r--boost/asio/impl/use_future.hpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/boost/asio/impl/use_future.hpp b/boost/asio/impl/use_future.hpp
index 92106f4704..c74050ea63 100644
--- a/boost/asio/impl/use_future.hpp
+++ b/boost/asio/impl/use_future.hpp
@@ -2,7 +2,7 @@
// impl/use_future.hpp
// ~~~~~~~~~~~~~~~~~~~
//
-// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -21,6 +21,7 @@
#include <boost/system/error_code.hpp>
#include <boost/asio/handler_type.hpp>
#include <boost/system/system_error.hpp>
+#include <boost/asio/detail/memory.hpp>
#include <boost/asio/detail/push_options.hpp>
@@ -37,9 +38,9 @@ namespace detail {
template <typename Alloc>
promise_handler(use_future_t<Alloc> uf)
: promise_(std::allocate_shared<std::promise<T> >(
- typename Alloc::template rebind<char>::other(uf.get_allocator()),
+ BOOST_ASIO_REBIND_ALLOC(Alloc, char)(uf.get_allocator()),
std::allocator_arg,
- typename Alloc::template rebind<char>::other(uf.get_allocator())))
+ BOOST_ASIO_REBIND_ALLOC(Alloc, char)(uf.get_allocator())))
{
}
@@ -71,9 +72,9 @@ namespace detail {
template <typename Alloc>
promise_handler(use_future_t<Alloc> uf)
: promise_(std::allocate_shared<std::promise<void> >(
- typename Alloc::template rebind<char>::other(uf.get_allocator()),
+ BOOST_ASIO_REBIND_ALLOC(Alloc, char)(uf.get_allocator()),
std::allocator_arg,
- typename Alloc::template rebind<char>::other(uf.get_allocator())))
+ BOOST_ASIO_REBIND_ALLOC(Alloc, char)(uf.get_allocator())))
{
}