0003-fix-strand.patch 1.3 KB

12345678910111213141516171819202122232425262728
  1. From e75d642726c4c78c368e74660ef4bc5503f3ec12 Mon Sep 17 00:00:00 2001
  2. From: Adam Duskett <aduskett@codeblue.com>
  3. Date: Sun, 14 Jan 2018 14:44:02 -0500
  4. Subject: [PATCH] fix strand
  5. From upstream, fixes compiling against boost 1.66 strand.
  6. Commit IDs 6b2e0480018530b616f61d5cdc786c92ba148bb7
  7. Signed-off-by: Adam Duskett <aduskett@codeblue.com>
  8. ---
  9. Release/include/pplx/threadpool.h | 2 +-
  10. Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp | 2 +-
  11. 2 files changed, 2 insertions(+), 2 deletions(-)
  12. diff --git a/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp b/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp
  13. index 0be40f6b..395632c3 100644
  14. --- a/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp
  15. +++ b/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp
  16. @@ -422,7 +422,7 @@ class connection : public config::socket_type::socket_con_type {
  17. m_io_service = io_service;
  18. if (config::enable_multithreading) {
  19. - m_strand = lib::make_shared<boost::asio::strand>(
  20. + m_strand = lib::make_shared<boost::asio::io_service::strand>(
  21. lib::ref(*io_service));
  22. m_async_read_handler = m_strand->wrap(lib::bind(