boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-08-03 14:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to some CI targets

Browse Source
This commit is contained in:
Vinnie Falco
2019-02-22 04:58:26 -08:00
parent 90b783cb62
commit c5af2e7fcc
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jamfile
View File

@@ -115,7 +115,7 @@ project /boost/beast
<target-os>solaris:<define>__EXTENSIONS__ <target-os>solaris:<define>__EXTENSIONS__
<target-os>solaris:<library>socket <target-os>solaris:<library>socket
<target-os>solaris:<library>nsl <target-os>solaris:<library>nsl
<target-os>windows:<define>_WIN32_WINNT=0x0501 <target-os>windows:<define>_WIN32_WINNT=0x0601
<target-os>windows,<toolset>cw:<library>ws2_32 <target-os>windows,<toolset>cw:<library>ws2_32
<target-os>windows,<toolset>cw:<library>mswsock <target-os>windows,<toolset>cw:<library>mswsock
<target-os>windows,<toolset>gcc:<library>ws2_32 <target-os>windows,<toolset>gcc:<library>ws2_32

5
include/boost/beast/core/detect_ssl.hpp
View File

@@ -495,8 +495,9 @@ public:
DetectHandler_&& handler, DetectHandler_&& handler,
AsyncReadStream& stream, AsyncReadStream& stream,
DynamicBuffer& buffer) DynamicBuffer& buffer)
: async_op_base<DetectHandler_, : beast::async_op_base<
executor_type<AsyncReadStream>>( DetectHandler_,
beast::executor_type<AsyncReadStream>>(
std::forward<DetectHandler_>(handler), std::forward<DetectHandler_>(handler),
stream.get_executor()) stream.get_executor())
, stream_(stream) , stream_(stream)

2
include/boost/beast/websocket/impl/handshake.hpp
View File

@@ -41,6 +41,8 @@ class stream<NextLayer, deflateSupported>::handshake_op
{ {
struct data struct data
{ {
data() = default; // for msvc
// VFALCO This really should be two separate // VFALCO This really should be two separate
// composed operations, to save on memory // composed operations, to save on memory
http::request<http::empty_body> req; http::request<http::empty_body> req;

2
test/beast/core/basic_stream.cpp
View File

@@ -157,7 +157,7 @@ struct test_acceptor
a.set_option( a.set_option(
net::socket_base::reuse_address(true)); net::socket_base::reuse_address(true));
a.bind(ep); a.bind(ep);
a.listen(1); a.listen(net::socket_base::max_listen_connections);
ep = a.local_endpoint(); ep = a.local_endpoint();
a.async_accept( a.async_accept(
[](error_code, net::ip::tcp::socket) [](error_code, net::ip::tcp::socket)