Protect calls from macros

fix #918
This commit is contained in:
Vinnie Falco
2017-12-02 05:57:06 -08:00
parent eb412ee958
commit eb0cc97e1a
15 changed files with 40 additions and 39 deletions

View File

@ -11,6 +11,7 @@ Version 148:
* Update reports for hybrid assessment
* Handle invalid deflate frames
* Fix CMakeLists.txt variable
* Protect calls from macros
--------------------------------------------------------------------------------

View File

@ -353,7 +353,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(handler_);
return (boost::asio::get_associated_allocator)(handler_);
}
// Executor hook. This is Asio's system for customizing the
@ -367,7 +367,7 @@ public:
executor_type get_executor() const noexcept
{
return boost::asio::get_associated_executor(handler_, stream_.get_executor());
return (boost::asio::get_associated_executor)(handler_, stream_.get_executor());
}
// Determines if the next asynchronous operation represents a

View File

@ -154,7 +154,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(p_.handler());
return (boost::asio::get_associated_allocator)(p_.handler());
}
// Executor hook. This is Asio's system for customizing the
@ -168,7 +168,7 @@ public:
executor_type get_executor() const noexcept
{
return boost::asio::get_associated_executor(
return (boost::asio::get_associated_executor)(
p_.handler(), p_->stream.get_executor());
}

View File

@ -123,7 +123,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(h_);
return (boost::asio::get_associated_allocator)(h_);
}
friend

View File

@ -55,7 +55,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(h_);
return (boost::asio::get_associated_allocator)(h_);
}
using executor_type =
@ -65,7 +65,7 @@ public:
executor_type
get_executor() const noexcept
{
return boost::asio::get_associated_executor(
return (boost::asio::get_associated_executor)(
h_, s_.get_executor());
}

View File

@ -364,7 +364,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(h_);
return (boost::asio::get_associated_allocator)(h_);
}
using executor_type =
@ -374,7 +374,7 @@ public:
executor_type
get_executor() const noexcept
{
return boost::asio::get_associated_executor(
return (boost::asio::get_associated_executor)(
h_, sock_.get_executor());
}

View File

@ -68,7 +68,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(h_);
return (boost::asio::get_associated_allocator)(h_);
}
using executor_type = boost::asio::associated_executor_t<
@ -77,7 +77,7 @@ public:
executor_type
get_executor() const noexcept
{
return boost::asio::get_associated_executor(
return (boost::asio::get_associated_executor)(
h_, s_.get_executor());
}
@ -227,7 +227,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(h_);
return (boost::asio::get_associated_allocator)(h_);
}
using executor_type = boost::asio::associated_executor_t<
@ -236,7 +236,7 @@ public:
executor_type
get_executor() const noexcept
{
return boost::asio::get_associated_executor(
return (boost::asio::get_associated_executor)(
h_, s_.get_executor());
}
@ -346,7 +346,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(d_.handler());
return (boost::asio::get_associated_allocator)(d_.handler());
}
using executor_type = boost::asio::associated_executor_t<
@ -355,7 +355,7 @@ public:
executor_type
get_executor() const noexcept
{
return boost::asio::get_associated_executor(
return (boost::asio::get_associated_executor)(
d_.handler(), d_->s.get_executor());
}

View File

@ -84,7 +84,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(h_);
return (boost::asio::get_associated_allocator)(h_);
}
using executor_type = boost::asio::associated_executor_t<
@ -93,7 +93,7 @@ public:
executor_type
get_executor() const noexcept
{
return boost::asio::get_associated_executor(
return (boost::asio::get_associated_executor)(
h_, s_.get_executor());
}
@ -220,7 +220,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(h_);
return (boost::asio::get_associated_allocator)(h_);
}
using executor_type = boost::asio::associated_executor_t<
@ -229,7 +229,7 @@ public:
executor_type
get_executor() const noexcept
{
return boost::asio::get_associated_executor(
return (boost::asio::get_associated_executor)(
h_, s_.get_executor());
}
@ -333,7 +333,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(d_.handler());
return (boost::asio::get_associated_allocator)(d_.handler());
}
using executor_type = boost::asio::associated_executor_t<
@ -342,7 +342,7 @@ public:
executor_type
get_executor() const noexcept
{
return boost::asio::get_associated_executor(
return (boost::asio::get_associated_executor)(
d_.handler(), d_->s.get_executor());
}

View File

@ -74,7 +74,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(d_.handler());
return (boost::asio::get_associated_allocator)(d_.handler());
}
using executor_type = boost::asio::associated_executor_t<
@ -83,7 +83,7 @@ public:
executor_type
get_executor() const noexcept
{
return boost::asio::get_associated_executor(
return (boost::asio::get_associated_executor)(
d_.handler(), d_->ws.get_executor());
}
@ -170,7 +170,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(d_.handler());
return (boost::asio::get_associated_allocator)(d_.handler());
}
using executor_type = boost::asio::associated_executor_t<
@ -179,7 +179,7 @@ public:
executor_type
get_executor() const noexcept
{
return boost::asio::get_associated_executor(
return (boost::asio::get_associated_executor)(
d_.handler(), d_->ws.get_executor());
}

View File

@ -81,7 +81,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(d_.handler());
return (boost::asio::get_associated_allocator)(d_.handler());
}
using executor_type = boost::asio::associated_executor_t<
@ -90,7 +90,7 @@ public:
executor_type
get_executor() const noexcept
{
return boost::asio::get_associated_executor(
return (boost::asio::get_associated_executor)(
d_.handler(), d_->ws.get_executor());
}

View File

@ -81,7 +81,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(d_.handler());
return (boost::asio::get_associated_allocator)(d_.handler());
}
using executor_type = boost::asio::associated_executor_t<
@ -90,7 +90,7 @@ public:
executor_type
get_executor() const noexcept
{
return boost::asio::get_associated_executor(
return (boost::asio::get_associated_executor)(
d_.handler(), d_->ws.get_executor());
}

View File

@ -81,7 +81,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(d_.handler());
return (boost::asio::get_associated_allocator)(d_.handler());
}
using executor_type = boost::asio::associated_executor_t<
@ -90,7 +90,7 @@ public:
executor_type
get_executor() const noexcept
{
return boost::asio::get_associated_executor(
return (boost::asio::get_associated_executor)(
d_.handler(), d_->ws.get_executor());
}

View File

@ -81,7 +81,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(h_);
return (boost::asio::get_associated_allocator)(h_);
}
using executor_type = boost::asio::associated_executor_t<
@ -90,7 +90,7 @@ public:
executor_type
get_executor() const noexcept
{
return boost::asio::get_associated_executor(
return (boost::asio::get_associated_executor)(
h_, ws_.get_executor());
}
@ -704,7 +704,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(h_);
return (boost::asio::get_associated_allocator)(h_);
}
using executor_type = boost::asio::associated_executor_t<
@ -713,7 +713,7 @@ public:
executor_type
get_executor() const noexcept
{
return boost::asio::get_associated_executor(
return (boost::asio::get_associated_executor)(
h_, ws_.get_executor());
}

View File

@ -56,7 +56,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(h_);
return (boost::asio::get_associated_allocator)(h_);
}
using executor_type = boost::asio::associated_executor_t<
@ -65,7 +65,7 @@ public:
executor_type
get_executor() const noexcept
{
return boost::asio::get_associated_executor(
return (boost::asio::get_associated_executor)(
h_, s_.get_executor());
}

View File

@ -76,7 +76,7 @@ public:
allocator_type
get_allocator() const noexcept
{
return boost::asio::get_associated_allocator(h_);
return (boost::asio::get_associated_allocator)(h_);
}
using executor_type = boost::asio::associated_executor_t<
@ -85,7 +85,7 @@ public:
executor_type
get_executor() const noexcept
{
return boost::asio::get_associated_executor(
return (boost::asio::get_associated_executor)(
h_, ws_.get_executor());
}