From cf6021a35583428eb5135885c8c65fd78ffa98b8 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Mon, 26 Nov 2018 12:04:03 -0800 Subject: [PATCH 1/3] Fix broken doc link --- CHANGELOG.md | 6 ++++++ doc/qbk/00_main.qbk | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50720440..d37e8150 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Version 190: + +* Fix broken doc link + +-------------------------------------------------------------------------------- + Version 189: * Add CppCon2018 chat server example and video diff --git a/doc/qbk/00_main.qbk b/doc/qbk/00_main.qbk index 3c9e4555..4d73e5bb 100644 --- a/doc/qbk/00_main.qbk +++ b/doc/qbk/00_main.qbk @@ -51,7 +51,7 @@ [def __ssl_stream__ [@boost:/doc/html/boost_asio/reference/ssl__stream.html `boost::asio::ssl::stream`]] [def __streambuf__ [@boost:/doc/html/boost_asio/reference/streambuf.html `boost::asio::streambuf`]] [def __use_future__ [@boost:/doc/html/boost_asio/reference/use_future_t.html `boost::asio::use_future`]] -[def __void_or_deduced__ [@boost:/doc/html/boost_asio/reference/asynchronous_operations/automatic_deduction_of_initiating_function_return_type.html ['DEDUCED]]] +[def __void_or_deduced__ [@boost:/doc/html/boost_asio/reference/asynchronous_operations.html#boost_asio.reference.asynchronous_operations.automatic_deduction_of_initiating_function_return_type ['DEDUCED]]] [def __yield_context__ [@boost:/doc/html/boost_asio/reference/yield_context.html `boost::asio::yield_context`]] [def __AsyncReadStream__ [@boost:/doc/html/boost_asio/reference/AsyncReadStream.html [*AsyncReadStream]]] From a5d5c7500a287d04f53f5ede461716452345e601 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Thu, 22 Nov 2018 17:28:57 -0800 Subject: [PATCH 2/3] example/cppcon2018 only requires C++11 --- CHANGELOG.md | 1 + example/cppcon2018/http_session.cpp | 20 ++++++------ example/cppcon2018/listener.cpp | 16 +++++----- example/cppcon2018/websocket_session.cpp | 40 ++++++++++++------------ 4 files changed, 39 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d37e8150..018348d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ Version 190: * Fix broken doc link +* example/cppcon2018 only requires C++11 -------------------------------------------------------------------------------- diff --git a/example/cppcon2018/http_session.cpp b/example/cppcon2018/http_session.cpp index 2c554b60..ac4f58ff 100644 --- a/example/cppcon2018/http_session.cpp +++ b/example/cppcon2018/http_session.cpp @@ -203,11 +203,11 @@ run() { // Read a request http::async_read(socket_, buffer_, req_, - [self = shared_from_this()] - (error_code ec, std::size_t bytes) - { - self->on_read(ec, bytes); - }); + std::bind( + &http_session::on_read, + shared_from_this(), + std::placeholders::_1, + std::placeholders::_2)); } // Report a failure @@ -341,9 +341,9 @@ on_write(error_code ec, std::size_t, bool close) // Read another request http::async_read(socket_, buffer_, req_, - [self = shared_from_this()] - (error_code ec, std::size_t bytes) - { - self->on_read(ec, bytes); - }); + std::bind( + &http_session::on_read, + shared_from_this(), + std::placeholders::_1, + std::placeholders::_2)); } diff --git a/example/cppcon2018/listener.cpp b/example/cppcon2018/listener.cpp index a6087260..cca4b320 100644 --- a/example/cppcon2018/listener.cpp +++ b/example/cppcon2018/listener.cpp @@ -63,10 +63,10 @@ run() // Start accepting a connection acceptor_.async_accept( socket_, - [self = shared_from_this()](error_code ec) - { - self->on_accept(ec); - }); + std::bind( + &listener::on_accept, + shared_from_this(), + std::placeholders::_1)); } // Report a failure @@ -96,8 +96,8 @@ on_accept(error_code ec) // Accept another connection acceptor_.async_accept( socket_, - [self = shared_from_this()](error_code ec) - { - self->on_accept(ec); - }); + std::bind( + &listener::on_accept, + shared_from_this(), + std::placeholders::_1)); } diff --git a/example/cppcon2018/websocket_session.cpp b/example/cppcon2018/websocket_session.cpp index e87cee58..55d0c4e0 100644 --- a/example/cppcon2018/websocket_session.cpp +++ b/example/cppcon2018/websocket_session.cpp @@ -51,11 +51,11 @@ on_accept(error_code ec) // Read a message ws_.async_read( buffer_, - [sp = shared_from_this()]( - error_code ec, std::size_t bytes) - { - sp->on_read(ec, bytes); - }); + std::bind( + &websocket_session::on_read, + shared_from_this(), + std::placeholders::_1, + std::placeholders::_2)); } void @@ -75,11 +75,11 @@ on_read(error_code ec, std::size_t) // Read another message ws_.async_read( buffer_, - [sp = shared_from_this()]( - error_code ec, std::size_t bytes) - { - sp->on_read(ec, bytes); - }); + std::bind( + &websocket_session::on_read, + shared_from_this(), + std::placeholders::_1, + std::placeholders::_2)); } void @@ -96,11 +96,11 @@ send(std::shared_ptr const& ss) // We are not currently writing, so send this immediately ws_.async_write( net::buffer(*queue_.front()), - [sp = shared_from_this()]( - error_code ec, std::size_t bytes) - { - sp->on_write(ec, bytes); - }); + std::bind( + &websocket_session::on_write, + shared_from_this(), + std::placeholders::_1, + std::placeholders::_2)); } void @@ -118,9 +118,9 @@ on_write(error_code ec, std::size_t) if(! queue_.empty()) ws_.async_write( net::buffer(*queue_.front()), - [sp = shared_from_this()]( - error_code ec, std::size_t bytes) - { - sp->on_write(ec, bytes); - }); + std::bind( + &websocket_session::on_write, + shared_from_this(), + std::placeholders::_1, + std::placeholders::_2)); } From 320037a6bc6e70adb5ec715dc2bdfce9ed0ba41e Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Mon, 26 Nov 2018 12:04:55 -0800 Subject: [PATCH 3/3] Set version to 189-hf1 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 018348d7..65bf91f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -Version 190: +Version 189-hf1: * Fix broken doc link * example/cppcon2018 only requires C++11