From d42fb59a64a60f8495179b71d88bf32e93448133 Mon Sep 17 00:00:00 2001 From: Randy Li Date: Fri, 1 Sep 2023 12:04:59 +0800 Subject: [PATCH 1/2] Fixup asio old service removed after boost 1.69 (#901) BOOST_ASIO_ENABLE_OLD_SERVICES option and all those header files are removed from boost asio 1.70. Signed-off-by: Hsia-Jun(Randy) Li Co-authored-by: Hsia-Jun(Randy) Li --- boost/network/protocol/stream_handler.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boost/network/protocol/stream_handler.hpp b/boost/network/protocol/stream_handler.hpp index 62c97ec4a..cd98b6875 100644 --- a/boost/network/protocol/stream_handler.hpp +++ b/boost/network/protocol/stream_handler.hpp @@ -13,12 +13,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #ifdef BOOST_NETWORK_ENABLE_HTTPS From 552ce94bd91c055f11ba524adf0ca0712063d711 Mon Sep 17 00:00:00 2001 From: jalegido Date: Thu, 7 Sep 2023 14:06:56 +0200 Subject: [PATCH 2/2] Compatibility with boost 1.83 (#902) Co-authored-by: jjll --- libs/network/src/server_request_parsers_impl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/network/src/server_request_parsers_impl.cpp b/libs/network/src/server_request_parsers_impl.cpp index 9a539b1ae..d3670e924 100644 --- a/libs/network/src/server_request_parsers_impl.cpp +++ b/libs/network/src/server_request_parsers_impl.cpp @@ -12,6 +12,7 @@ #include #include #include +#include namespace boost { namespace spirit { @@ -22,7 +23,7 @@ typedef std::basic_string u32_string; template <> // struct assign_to_container_from_value { static void call(u32_string const& val, std::string& attr) { - u32_to_u8_iterator begin = val.begin(), + boost::u32_to_u8_iterator begin = val.begin(), end = val.end(); for (; begin != end; ++begin) attr += *begin; }