AuroraMiddleware/asio
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix boostify.pl to work with latest code.

Browse Source
This commit is contained in:
Christopher Kohlhoff 2017-10-23 09:17:17 +11:00
parent 2ccb648f44
commit e39a95a73e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
asio/boostify.pl
View File

@ -154,7 +154,7 @@ sub copy_source_file
} }
# Conditional replacements. # Conditional replacements.
if ($line =~ /^( *)namespace asio {/) if ($line =~ /^( *)namespace asio \{/)
{ {
if ($is_qbk) if ($is_qbk)
{ {
@ -242,7 +242,7 @@ sub copy_source_file
{ {
# Line is removed. # Line is removed.
} }
elsif ($line =~ /asio::thread/) elsif ($line =~ /asio::thread\b/)
{ {
if ($is_test) if ($is_test)
{ {
@ -269,7 +269,7 @@ sub copy_source_file
print_line($output, $1 . "boost::thread" . $2, $from, $lineno); print_line($output, $1 . "boost::thread" . $2, $from, $lineno);
} }
} }
elsif ($line =~ /namespace std {/) elsif ($line =~ /namespace std \{ *$/)
{ {
print_line($output, "namespace boost {", $from, $lineno); print_line($output, "namespace boost {", $from, $lineno);
print_line($output, "namespace system {", $from, $lineno); print_line($output, "namespace system {", $from, $lineno);
@ -277,6 +277,7 @@ sub copy_source_file
elsif ($line =~ /std::error_code/) elsif ($line =~ /std::error_code/)
{ {
$line =~ s/std::error_code/boost::system::error_code/g; $line =~ s/std::error_code/boost::system::error_code/g;
$line =~ s/asio::/boost::asio::/g if !$is_xsl;
print_line($output, $line, $from, $lineno); print_line($output, $line, $from, $lineno);
} }
elsif ($line =~ /} \/\/ namespace std/) elsif ($line =~ /} \/\/ namespace std/)