diff --git a/boostify.pl b/boostify.pl index a52b886633..88769e068c 100755 --- a/boostify.pl +++ b/boostify.pl @@ -131,9 +131,9 @@ sub copy_source_file $line =~ s/[\\@]ref async_read/boost::asio::async_read()/g; $line =~ s/[\\@]ref async_write/boost::asio::async_write()/g; } - if ($line =~ /asio_detail_posix_thread_function/) + if ($line =~ /asio_detail_posix_thread_function_for_external_allocator/) { - $line =~ s/asio_detail_posix_thread_function/boost_asio_detail_posix_thread_function/g; + $line =~ s/asio_detail_posix_thread_function_for_external_allocator/boost_asio_detail_posix_thread_function_for_external_allocator/g; } if ($line =~ /asio_signal_handler/) { diff --git a/include/asio/detail/impl/posix_thread.ipp b/include/asio/detail/impl/posix_thread.ipp index 4e39e8725f..70f8431d99 100644 --- a/include/asio/detail/impl/posix_thread.ipp +++ b/include/asio/detail/impl/posix_thread.ipp @@ -57,7 +57,7 @@ std::size_t posix_thread::hardware_concurrency() posix_thread::func_base* posix_thread::start_thread(func_base* arg) { int error = ::pthread_create(&arg->thread_, 0, - asio_detail_posix_thread_function, arg); + asio_detail_posix_thread_function_for_external_allocator, arg); if (error != 0) { arg->destroy(); @@ -68,7 +68,7 @@ posix_thread::func_base* posix_thread::start_thread(func_base* arg) return arg; } -void* asio_detail_posix_thread_function(void* arg) +void* asio_detail_posix_thread_function_for_external_allocator(void* arg) { static_cast(arg)->run(); return 0; diff --git a/include/asio/detail/posix_thread.hpp b/include/asio/detail/posix_thread.hpp index c29e25aa74..b70d64661e 100644 --- a/include/asio/detail/posix_thread.hpp +++ b/include/asio/detail/posix_thread.hpp @@ -30,7 +30,7 @@ namespace detail { extern "C" { - ASIO_DECL void* asio_detail_posix_thread_function(void* arg); + ASIO_DECL void* asio_detail_posix_thread_function_for_external_allocator(void* arg); } class posix_thread @@ -88,7 +88,7 @@ class posix_thread ASIO_DECL static std::size_t hardware_concurrency(); private: - friend void* asio_detail_posix_thread_function(void* arg); + friend void* asio_detail_posix_thread_function_for_external_allocator(void* arg); class func_base {