Skip to content

Change posix_thread entry symbol name to avoid clashes #1709 #1710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EikeAtOT wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change posix_thread entry symbol name to avoid clashes #1709 #1710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions boostify.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
{
Expand Down
4 changes: 2 additions & 2 deletions include/asio/detail/impl/posix_thread.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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<posix_thread::func_base*>(arg)->run();
return 0;
Expand Down
4 changes: 2 additions & 2 deletions include/asio/detail/posix_thread.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
{
Expand Down