diff options
Diffstat (limited to '3rdparty/asio/src/examples/cpp03/http')
73 files changed, 98 insertions, 499 deletions
diff --git a/3rdparty/asio/src/examples/cpp03/http/client/.gitignore b/3rdparty/asio/src/examples/cpp03/http/client/.gitignore deleted file mode 100644 index e80f510d76c..00000000000 --- a/3rdparty/asio/src/examples/cpp03/http/client/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -.deps -.dirstamp -*.o -*.obj -*.exe -*_client -*.ilk -*.manifest -*.pdb -*.tds diff --git a/3rdparty/asio/src/examples/cpp03/http/client/async_client.cpp b/3rdparty/asio/src/examples/cpp03/http/client/async_client.cpp index 83dcc36d53a..210715bbd98 100644 --- a/3rdparty/asio/src/examples/cpp03/http/client/async_client.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/client/async_client.cpp @@ -2,7 +2,7 @@ // async_client.cpp // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -13,7 +13,7 @@ #include <ostream> #include <string> #include <asio.hpp> -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> using asio::ip::tcp; diff --git a/3rdparty/asio/src/examples/cpp03/http/client/sync_client.cpp b/3rdparty/asio/src/examples/cpp03/http/client/sync_client.cpp index a11b5c7c76a..fde984a6f4f 100644 --- a/3rdparty/asio/src/examples/cpp03/http/client/sync_client.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/client/sync_client.cpp @@ -2,7 +2,7 @@ // sync_client.cpp // ~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/doc_root/data_1K.html b/3rdparty/asio/src/examples/cpp03/http/doc_root/data_1K.html deleted file mode 100644 index 1372c4dd177..00000000000 --- a/3rdparty/asio/src/examples/cpp03/http/doc_root/data_1K.html +++ /dev/null @@ -1,28 +0,0 @@ -<!-- -Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) - -Distributed under the Boost Software License, Version 1.0. (See accompanying -file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ---> - -<html> -<body> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the<br/> -</body> -</html> - -<!-- boostinspect:nounlinked --> diff --git a/3rdparty/asio/src/examples/cpp03/http/doc_root/data_2K.html b/3rdparty/asio/src/examples/cpp03/http/doc_root/data_2K.html deleted file mode 100644 index 686ce52b0a0..00000000000 --- a/3rdparty/asio/src/examples/cpp03/http/doc_root/data_2K.html +++ /dev/null @@ -1,49 +0,0 @@ -<!-- -Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) - -Distributed under the Boost Software License, Version 1.0. (See accompanying -file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ---> - -<html> -<body> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps ove<br/> -</body> -</html> - -<!-- boostinspect:nounlinked --> diff --git a/3rdparty/asio/src/examples/cpp03/http/doc_root/data_4K.html b/3rdparty/asio/src/examples/cpp03/http/doc_root/data_4K.html deleted file mode 100644 index f5db0a2bc00..00000000000 --- a/3rdparty/asio/src/examples/cpp03/http/doc_root/data_4K.html +++ /dev/null @@ -1,91 +0,0 @@ -<!-- -Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) - -Distributed under the Boost Software License, Version 1.0. (See accompanying -file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ---> - -<html> -<body> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox<br/> -</body> -</html> - -<!-- boostinspect:nounlinked --> diff --git a/3rdparty/asio/src/examples/cpp03/http/doc_root/data_8K.html b/3rdparty/asio/src/examples/cpp03/http/doc_root/data_8K.html deleted file mode 100644 index 0d42f72886b..00000000000 --- a/3rdparty/asio/src/examples/cpp03/http/doc_root/data_8K.html +++ /dev/null @@ -1,175 +0,0 @@ -<!-- -Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) - -Distributed under the Boost Software License, Version 1.0. (See accompanying -file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ---> - -<html> -<body> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -The quick brown fox jumps over the lazy dog<br/> -.... -</body> -</html> - -<!-- boostinspect:nounlinked --> diff --git a/3rdparty/asio/src/examples/cpp03/http/server/.gitignore b/3rdparty/asio/src/examples/cpp03/http/server/.gitignore deleted file mode 100644 index 0882fa6ced3..00000000000 --- a/3rdparty/asio/src/examples/cpp03/http/server/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -.deps -.dirstamp -*.o -*.obj -*.exe -*_server -*_client -*.ilk -*.manifest -*.pdb -*.tds diff --git a/3rdparty/asio/src/examples/cpp03/http/server/connection.cpp b/3rdparty/asio/src/examples/cpp03/http/server/connection.cpp index acbf637b453..f9bcad8671e 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server/connection.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server/connection.cpp @@ -2,7 +2,7 @@ // connection.cpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -10,7 +10,7 @@ #include "connection.hpp" #include <vector> -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> #include "connection_manager.hpp" #include "request_handler.hpp" diff --git a/3rdparty/asio/src/examples/cpp03/http/server/connection.hpp b/3rdparty/asio/src/examples/cpp03/http/server/connection.hpp index 6193b486443..2c842904471 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server/connection.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server/connection.hpp @@ -2,7 +2,7 @@ // connection.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server/connection_manager.cpp b/3rdparty/asio/src/examples/cpp03/http/server/connection_manager.cpp index 8fc9d8f285b..bfcac68a6a4 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server/connection_manager.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server/connection_manager.cpp @@ -2,7 +2,7 @@ // connection_manager.cpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -10,7 +10,7 @@ #include "connection_manager.hpp" #include <algorithm> -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> namespace http { namespace server { @@ -30,7 +30,7 @@ void connection_manager::stop(connection_ptr c) void connection_manager::stop_all() { std::for_each(connections_.begin(), connections_.end(), - boost::bind(&connection::stop, _1)); + boost::bind(&connection::stop, boost::placeholders::_1)); connections_.clear(); } diff --git a/3rdparty/asio/src/examples/cpp03/http/server/connection_manager.hpp b/3rdparty/asio/src/examples/cpp03/http/server/connection_manager.hpp index e67653f6a26..723d26e770d 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server/connection_manager.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server/connection_manager.hpp @@ -2,7 +2,7 @@ // connection_manager.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server/header.hpp b/3rdparty/asio/src/examples/cpp03/http/server/header.hpp index 22e3c4a7a10..bccbf977a9e 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server/header.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server/header.hpp @@ -2,7 +2,7 @@ // header.hpp // ~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server/main.cpp b/3rdparty/asio/src/examples/cpp03/http/server/main.cpp index 32d6f54dcb5..f66cb447a5e 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server/main.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server/main.cpp @@ -2,7 +2,7 @@ // main.cpp // ~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -11,7 +11,7 @@ #include <iostream> #include <string> #include <asio.hpp> -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> #include "server.hpp" int main(int argc, char* argv[]) diff --git a/3rdparty/asio/src/examples/cpp03/http/server/mime_types.cpp b/3rdparty/asio/src/examples/cpp03/http/server/mime_types.cpp index 80fdfe30e64..7542c690012 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server/mime_types.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server/mime_types.cpp @@ -2,7 +2,7 @@ // mime_types.cpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server/mime_types.hpp b/3rdparty/asio/src/examples/cpp03/http/server/mime_types.hpp index 2fc0332791f..aef5676104e 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server/mime_types.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server/mime_types.hpp @@ -2,7 +2,7 @@ // mime_types.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server/reply.cpp b/3rdparty/asio/src/examples/cpp03/http/server/reply.cpp index f3730d3d94d..70219748a86 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server/reply.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server/reply.cpp @@ -2,7 +2,7 @@ // reply.cpp // ~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server/reply.hpp b/3rdparty/asio/src/examples/cpp03/http/server/reply.hpp index 5189ac4363e..c8f3f11040d 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server/reply.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server/reply.hpp @@ -2,7 +2,7 @@ // reply.hpp // ~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server/request.hpp b/3rdparty/asio/src/examples/cpp03/http/server/request.hpp index 129a3990b3d..8a6a2bdf824 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server/request.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server/request.hpp @@ -2,7 +2,7 @@ // request.hpp // ~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server/request_handler.cpp b/3rdparty/asio/src/examples/cpp03/http/server/request_handler.cpp index 1201ef109d2..d86632a9a02 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server/request_handler.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server/request_handler.cpp @@ -2,7 +2,7 @@ // request_handler.cpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server/request_handler.hpp b/3rdparty/asio/src/examples/cpp03/http/server/request_handler.hpp index 56a16dd395a..413a69f49a5 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server/request_handler.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server/request_handler.hpp @@ -2,7 +2,7 @@ // request_handler.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server/request_parser.cpp b/3rdparty/asio/src/examples/cpp03/http/server/request_parser.cpp index 80644eea529..2f502d5e023 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server/request_parser.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server/request_parser.cpp @@ -2,7 +2,7 @@ // request_parser.cpp // ~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server/request_parser.hpp b/3rdparty/asio/src/examples/cpp03/http/server/request_parser.hpp index d7da53cf030..0c7e0f74368 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server/request_parser.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server/request_parser.hpp @@ -2,7 +2,7 @@ // request_parser.hpp // ~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server/server.cpp b/3rdparty/asio/src/examples/cpp03/http/server/server.cpp index 89e19d08d42..2b7d11d3323 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server/server.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server/server.cpp @@ -2,14 +2,14 @@ // server.cpp // ~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // #include "server.hpp" -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> #include <signal.h> namespace http { diff --git a/3rdparty/asio/src/examples/cpp03/http/server/server.hpp b/3rdparty/asio/src/examples/cpp03/http/server/server.hpp index 8b0b1a23296..d5d6ee4f343 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server/server.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server/server.hpp @@ -2,7 +2,7 @@ // server.hpp // ~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server2/.gitignore b/3rdparty/asio/src/examples/cpp03/http/server2/.gitignore deleted file mode 100644 index 0882fa6ced3..00000000000 --- a/3rdparty/asio/src/examples/cpp03/http/server2/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -.deps -.dirstamp -*.o -*.obj -*.exe -*_server -*_client -*.ilk -*.manifest -*.pdb -*.tds diff --git a/3rdparty/asio/src/examples/cpp03/http/server2/connection.cpp b/3rdparty/asio/src/examples/cpp03/http/server2/connection.cpp index 81f4a102217..08a99dbaf31 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server2/connection.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server2/connection.cpp @@ -2,7 +2,7 @@ // connection.cpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -10,7 +10,7 @@ #include "connection.hpp" #include <vector> -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> #include "request_handler.hpp" namespace http { diff --git a/3rdparty/asio/src/examples/cpp03/http/server2/connection.hpp b/3rdparty/asio/src/examples/cpp03/http/server2/connection.hpp index 9c624a8a172..3379fbb5649 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server2/connection.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server2/connection.hpp @@ -2,7 +2,7 @@ // connection.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server2/header.hpp b/3rdparty/asio/src/examples/cpp03/http/server2/header.hpp index 0e44c551409..acba8ddf5ea 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server2/header.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server2/header.hpp @@ -2,7 +2,7 @@ // header.hpp // ~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server2/io_context_pool.cpp b/3rdparty/asio/src/examples/cpp03/http/server2/io_context_pool.cpp index 049ac988615..9f0ec9f1984 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server2/io_context_pool.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server2/io_context_pool.cpp @@ -2,7 +2,7 @@ // io_context_pool.cpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -10,7 +10,7 @@ #include "server.hpp" #include <stdexcept> -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> #include <boost/shared_ptr.hpp> namespace http { @@ -28,7 +28,8 @@ io_context_pool::io_context_pool(std::size_t pool_size) { io_context_ptr io_context(new asio::io_context); io_contexts_.push_back(io_context); - work_.push_back(asio::make_work_guard(*io_context)); + work_.push_back(asio::require(io_context->get_executor(), + asio::execution::outstanding_work.tracked)); } } diff --git a/3rdparty/asio/src/examples/cpp03/http/server2/io_context_pool.hpp b/3rdparty/asio/src/examples/cpp03/http/server2/io_context_pool.hpp index 6a573c539f6..c08091dcefe 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server2/io_context_pool.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server2/io_context_pool.hpp @@ -2,7 +2,7 @@ // io_context_pool.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -12,6 +12,7 @@ #define HTTP_SERVER2_IO_SERVICE_POOL_HPP #include <asio.hpp> +#include <list> #include <vector> #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> @@ -38,14 +39,12 @@ public: private: typedef boost::shared_ptr<asio::io_context> io_context_ptr; - typedef asio::executor_work_guard< - asio::io_context::executor_type> io_context_work; /// The pool of io_contexts. std::vector<io_context_ptr> io_contexts_; - /// The work that keeps the io_contexts running. - std::vector<io_context_work> work_; + /// The work-tracking executors that keep the io_contexts running. + std::list<asio::any_io_executor> work_; /// The next io_context to use for a connection. std::size_t next_io_context_; diff --git a/3rdparty/asio/src/examples/cpp03/http/server2/main.cpp b/3rdparty/asio/src/examples/cpp03/http/server2/main.cpp index 2d224c5bac1..78cf0a72618 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server2/main.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server2/main.cpp @@ -2,7 +2,7 @@ // main.cpp // ~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -11,7 +11,7 @@ #include <iostream> #include <string> #include <asio.hpp> -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> #include <boost/lexical_cast.hpp> #include "server.hpp" diff --git a/3rdparty/asio/src/examples/cpp03/http/server2/mime_types.cpp b/3rdparty/asio/src/examples/cpp03/http/server2/mime_types.cpp index 640f3aedc44..67f23dc108b 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server2/mime_types.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server2/mime_types.cpp @@ -2,7 +2,7 @@ // mime_types.cpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server2/mime_types.hpp b/3rdparty/asio/src/examples/cpp03/http/server2/mime_types.hpp index 57d1412b7b1..53c83470477 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server2/mime_types.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server2/mime_types.hpp @@ -2,7 +2,7 @@ // mime_types.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server2/reply.cpp b/3rdparty/asio/src/examples/cpp03/http/server2/reply.cpp index 958577b2ce4..c5eb79130de 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server2/reply.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server2/reply.cpp @@ -2,7 +2,7 @@ // reply.cpp // ~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server2/reply.hpp b/3rdparty/asio/src/examples/cpp03/http/server2/reply.hpp index 17f11e7dde3..6a99edac7c0 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server2/reply.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server2/reply.hpp @@ -2,7 +2,7 @@ // reply.hpp // ~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server2/request.hpp b/3rdparty/asio/src/examples/cpp03/http/server2/request.hpp index 39070ee2f84..4c54b2028dd 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server2/request.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server2/request.hpp @@ -2,7 +2,7 @@ // request.hpp // ~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server2/request_handler.cpp b/3rdparty/asio/src/examples/cpp03/http/server2/request_handler.cpp index 9369c107166..42677d3defb 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server2/request_handler.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server2/request_handler.cpp @@ -2,7 +2,7 @@ // request_handler.cpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server2/request_handler.hpp b/3rdparty/asio/src/examples/cpp03/http/server2/request_handler.hpp index 8d24686fa54..b4d8d1b5c73 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server2/request_handler.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server2/request_handler.hpp @@ -2,7 +2,7 @@ // request_handler.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server2/request_parser.cpp b/3rdparty/asio/src/examples/cpp03/http/server2/request_parser.cpp index ae80b20f784..5c10ec8580d 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server2/request_parser.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server2/request_parser.cpp @@ -2,7 +2,7 @@ // request_parser.cpp // ~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server2/request_parser.hpp b/3rdparty/asio/src/examples/cpp03/http/server2/request_parser.hpp index 133a6492058..359adc6f0b0 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server2/request_parser.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server2/request_parser.hpp @@ -2,7 +2,7 @@ // request_parser.hpp // ~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server2/server.cpp b/3rdparty/asio/src/examples/cpp03/http/server2/server.cpp index 75d3a48aa84..72ebcf9f352 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server2/server.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server2/server.cpp @@ -2,14 +2,14 @@ // server.cpp // ~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // #include "server.hpp" -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> namespace http { namespace server2 { @@ -33,7 +33,7 @@ server::server(const std::string& address, const std::string& port, signals_.async_wait(boost::bind(&server::handle_stop, this)); // Open the acceptor with the option to reuse the address (i.e. SO_REUSEADDR). - asio::ip::tcp::resolver resolver(acceptor_.get_executor().context()); + asio::ip::tcp::resolver resolver(acceptor_.get_executor()); asio::ip::tcp::endpoint endpoint = *resolver.resolve(address, port).begin(); acceptor_.open(endpoint.protocol()); diff --git a/3rdparty/asio/src/examples/cpp03/http/server2/server.hpp b/3rdparty/asio/src/examples/cpp03/http/server2/server.hpp index 6a742a8220a..9bcdbe093aa 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server2/server.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server2/server.hpp @@ -2,7 +2,7 @@ // server.hpp // ~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server3/.gitignore b/3rdparty/asio/src/examples/cpp03/http/server3/.gitignore deleted file mode 100644 index 0882fa6ced3..00000000000 --- a/3rdparty/asio/src/examples/cpp03/http/server3/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -.deps -.dirstamp -*.o -*.obj -*.exe -*_server -*_client -*.ilk -*.manifest -*.pdb -*.tds diff --git a/3rdparty/asio/src/examples/cpp03/http/server3/connection.cpp b/3rdparty/asio/src/examples/cpp03/http/server3/connection.cpp index 5db960a9109..f46b01bc373 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server3/connection.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server3/connection.cpp @@ -2,7 +2,7 @@ // connection.cpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -10,7 +10,7 @@ #include "connection.hpp" #include <vector> -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> #include "request_handler.hpp" namespace http { @@ -18,8 +18,8 @@ namespace server3 { connection::connection(asio::io_context& io_context, request_handler& handler) - : strand_(io_context), - socket_(io_context), + : strand_(asio::make_strand(io_context)), + socket_(strand_), request_handler_(handler) { } @@ -32,10 +32,9 @@ asio::ip::tcp::socket& connection::socket() void connection::start() { socket_.async_read_some(asio::buffer(buffer_), - asio::bind_executor(strand_, - boost::bind(&connection::handle_read, shared_from_this(), - asio::placeholders::error, - asio::placeholders::bytes_transferred))); + boost::bind(&connection::handle_read, shared_from_this(), + asio::placeholders::error, + asio::placeholders::bytes_transferred)); } void connection::handle_read(const asio::error_code& e, @@ -51,25 +50,22 @@ void connection::handle_read(const asio::error_code& e, { request_handler_.handle_request(request_, reply_); asio::async_write(socket_, reply_.to_buffers(), - asio::bind_executor(strand_, - boost::bind(&connection::handle_write, shared_from_this(), - asio::placeholders::error))); + boost::bind(&connection::handle_write, shared_from_this(), + asio::placeholders::error)); } else if (!result) { reply_ = reply::stock_reply(reply::bad_request); asio::async_write(socket_, reply_.to_buffers(), - asio::bind_executor(strand_, - boost::bind(&connection::handle_write, shared_from_this(), - asio::placeholders::error))); + boost::bind(&connection::handle_write, shared_from_this(), + asio::placeholders::error)); } else { socket_.async_read_some(asio::buffer(buffer_), - asio::bind_executor(strand_, - boost::bind(&connection::handle_read, shared_from_this(), - asio::placeholders::error, - asio::placeholders::bytes_transferred))); + boost::bind(&connection::handle_read, shared_from_this(), + asio::placeholders::error, + asio::placeholders::bytes_transferred)); } } diff --git a/3rdparty/asio/src/examples/cpp03/http/server3/connection.hpp b/3rdparty/asio/src/examples/cpp03/http/server3/connection.hpp index 2aac1a5c7ae..5fa129a6061 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server3/connection.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server3/connection.hpp @@ -2,7 +2,7 @@ // connection.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -49,7 +49,7 @@ private: void handle_write(const asio::error_code& e); /// Strand to ensure the connection's handlers are not called concurrently. - asio::io_context::strand strand_; + asio::strand<asio::io_context::executor_type> strand_; /// Socket for the connection. asio::ip::tcp::socket socket_; diff --git a/3rdparty/asio/src/examples/cpp03/http/server3/header.hpp b/3rdparty/asio/src/examples/cpp03/http/server3/header.hpp index 207c6290784..f709b1789e1 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server3/header.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server3/header.hpp @@ -2,7 +2,7 @@ // header.hpp // ~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server3/main.cpp b/3rdparty/asio/src/examples/cpp03/http/server3/main.cpp index 367efad729f..2daf0ee9568 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server3/main.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server3/main.cpp @@ -2,7 +2,7 @@ // main.cpp // ~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -11,7 +11,7 @@ #include <iostream> #include <string> #include <asio.hpp> -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> #include <boost/lexical_cast.hpp> #include "server.hpp" diff --git a/3rdparty/asio/src/examples/cpp03/http/server3/mime_types.cpp b/3rdparty/asio/src/examples/cpp03/http/server3/mime_types.cpp index 0b0c66e3ce4..78850acafbf 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server3/mime_types.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server3/mime_types.cpp @@ -2,7 +2,7 @@ // mime_types.cpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server3/mime_types.hpp b/3rdparty/asio/src/examples/cpp03/http/server3/mime_types.hpp index 502766aa5ab..a556356010f 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server3/mime_types.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server3/mime_types.hpp @@ -2,7 +2,7 @@ // mime_types.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server3/reply.cpp b/3rdparty/asio/src/examples/cpp03/http/server3/reply.cpp index 79790a1df77..fe304271d61 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server3/reply.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server3/reply.cpp @@ -2,7 +2,7 @@ // reply.cpp // ~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server3/reply.hpp b/3rdparty/asio/src/examples/cpp03/http/server3/reply.hpp index 9b057ca351d..fe43fd8573e 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server3/reply.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server3/reply.hpp @@ -2,7 +2,7 @@ // reply.hpp // ~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server3/request.hpp b/3rdparty/asio/src/examples/cpp03/http/server3/request.hpp index a5b34e03f8a..40fd359c173 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server3/request.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server3/request.hpp @@ -2,7 +2,7 @@ // request.hpp // ~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server3/request_handler.cpp b/3rdparty/asio/src/examples/cpp03/http/server3/request_handler.cpp index 9feb1cf1e3c..64efd8d02a5 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server3/request_handler.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server3/request_handler.cpp @@ -2,7 +2,7 @@ // request_handler.cpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server3/request_handler.hpp b/3rdparty/asio/src/examples/cpp03/http/server3/request_handler.hpp index bb94cad0d1d..e9f16d2d492 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server3/request_handler.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server3/request_handler.hpp @@ -2,7 +2,7 @@ // request_handler.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server3/request_parser.cpp b/3rdparty/asio/src/examples/cpp03/http/server3/request_parser.cpp index 98f91286fe8..9cd46e4e5e2 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server3/request_parser.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server3/request_parser.cpp @@ -2,7 +2,7 @@ // request_parser.cpp // ~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server3/request_parser.hpp b/3rdparty/asio/src/examples/cpp03/http/server3/request_parser.hpp index b680eee037b..ff6576ef57e 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server3/request_parser.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server3/request_parser.hpp @@ -2,7 +2,7 @@ // request_parser.hpp // ~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server3/server.cpp b/3rdparty/asio/src/examples/cpp03/http/server3/server.cpp index 2a78bc9719e..469afe217da 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server3/server.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server3/server.cpp @@ -2,14 +2,14 @@ // server.cpp // ~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // #include "server.hpp" -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> #include <boost/shared_ptr.hpp> #include <vector> diff --git a/3rdparty/asio/src/examples/cpp03/http/server3/server.hpp b/3rdparty/asio/src/examples/cpp03/http/server3/server.hpp index c58c2433f65..59d20306db6 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server3/server.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server3/server.hpp @@ -2,7 +2,7 @@ // server.hpp // ~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server4/.gitignore b/3rdparty/asio/src/examples/cpp03/http/server4/.gitignore deleted file mode 100644 index 0882fa6ced3..00000000000 --- a/3rdparty/asio/src/examples/cpp03/http/server4/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -.deps -.dirstamp -*.o -*.obj -*.exe -*_server -*_client -*.ilk -*.manifest -*.pdb -*.tds diff --git a/3rdparty/asio/src/examples/cpp03/http/server4/file_handler.cpp b/3rdparty/asio/src/examples/cpp03/http/server4/file_handler.cpp index a4ac912b155..310a518fefa 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server4/file_handler.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server4/file_handler.cpp @@ -2,7 +2,7 @@ // file_handler.cpp // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server4/file_handler.hpp b/3rdparty/asio/src/examples/cpp03/http/server4/file_handler.hpp index 22055dbcb1b..3d898cce149 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server4/file_handler.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server4/file_handler.hpp @@ -2,7 +2,7 @@ // file_handler.hpp // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server4/header.hpp b/3rdparty/asio/src/examples/cpp03/http/server4/header.hpp index 9c9b89cca06..ee5d8bf727d 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server4/header.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server4/header.hpp @@ -2,7 +2,7 @@ // header.hpp // ~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server4/main.cpp b/3rdparty/asio/src/examples/cpp03/http/server4/main.cpp index 0ebe535ad17..58e1ae8f0af 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server4/main.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server4/main.cpp @@ -2,7 +2,7 @@ // main.cpp // ~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -10,7 +10,7 @@ #include <iostream> #include <asio.hpp> -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> #include <signal.h> #include "server.hpp" #include "file_handler.hpp" diff --git a/3rdparty/asio/src/examples/cpp03/http/server4/mime_types.cpp b/3rdparty/asio/src/examples/cpp03/http/server4/mime_types.cpp index 903dffca59e..c6f421c76c3 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server4/mime_types.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server4/mime_types.cpp @@ -2,7 +2,7 @@ // mime_types.cpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server4/mime_types.hpp b/3rdparty/asio/src/examples/cpp03/http/server4/mime_types.hpp index f702c6f859b..699b7bf0051 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server4/mime_types.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server4/mime_types.hpp @@ -2,7 +2,7 @@ // mime_types.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server4/reply.cpp b/3rdparty/asio/src/examples/cpp03/http/server4/reply.cpp index f508a46765f..e9c1eb68e97 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server4/reply.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server4/reply.cpp @@ -2,7 +2,7 @@ // reply.cpp // ~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server4/reply.hpp b/3rdparty/asio/src/examples/cpp03/http/server4/reply.hpp index 02743a549be..5aaefae7e2a 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server4/reply.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server4/reply.hpp @@ -2,7 +2,7 @@ // reply.hpp // ~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server4/request.hpp b/3rdparty/asio/src/examples/cpp03/http/server4/request.hpp index 43947d7f09e..c3642652bcc 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server4/request.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server4/request.hpp @@ -2,7 +2,7 @@ // request.hpp // ~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server4/request_parser.cpp b/3rdparty/asio/src/examples/cpp03/http/server4/request_parser.cpp index 0ec31ad3939..30dad0327fe 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server4/request_parser.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server4/request_parser.cpp @@ -2,7 +2,7 @@ // request_parser.cpp // ~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server4/request_parser.hpp b/3rdparty/asio/src/examples/cpp03/http/server4/request_parser.hpp index a61356e36a6..57c435251c8 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server4/request_parser.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server4/request_parser.hpp @@ -2,7 +2,7 @@ // request_parser.hpp // ~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/3rdparty/asio/src/examples/cpp03/http/server4/server.cpp b/3rdparty/asio/src/examples/cpp03/http/server4/server.cpp index 04d81a984b6..c8abd2bddf5 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server4/server.cpp +++ b/3rdparty/asio/src/examples/cpp03/http/server4/server.cpp @@ -2,7 +2,7 @@ // server.cpp // ~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -45,7 +45,7 @@ void server::operator()(asio::error_code ec, std::size_t length) do { // Create a new socket for the next incoming connection. - socket_.reset(new tcp::socket(acceptor_->get_executor().context())); + socket_.reset(new tcp::socket(acceptor_->get_executor())); // Accept a new connection. The "yield" pseudo-keyword saves the current // line number and exits the coroutine's "reenter" block. We use the diff --git a/3rdparty/asio/src/examples/cpp03/http/server4/server.hpp b/3rdparty/asio/src/examples/cpp03/http/server4/server.hpp index 580ece5e097..e45cc7a3ca5 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server4/server.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server4/server.hpp @@ -2,7 +2,7 @@ // server.hpp // ~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
