summaryrefslogtreecommitdiff
path: root/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch
diff options
context:
space:
mode:
Diffstat (limited to 'games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch')
-rw-r--r--games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch b/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch
new file mode 100644
index 000000000000..90c526789c51
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch
@@ -0,0 +1,24 @@
+From 9d0e3bae096563297c9f51355968f27a67dbfdec Mon Sep 17 00:00:00 2001
+From: Charles Dang <exodia339@gmail.com>
+Date: Mon, 15 Jul 2019 03:18:31 +1100
+Subject: [PATCH] Removed redundant std::ref causing problems with Boost 1.70
+ (fixes #3990)
+
+The asio socket ctor already takes a reference.
+---
+ src/server/server_base.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/server/server_base.cpp b/src/server/server_base.cpp
+index 82b46e912025..8bcf974a62d1 100644
+--- a/src/server/server_base.cpp
++++ b/src/server/server_base.cpp
+@@ -65,7 +65,7 @@ void server_base::start_server()
+
+ void server_base::serve()
+ {
+- socket_ptr socket = std::make_shared<boost::asio::ip::tcp::socket>(std::ref(io_service_));
++ socket_ptr socket = std::make_shared<boost::asio::ip::tcp::socket>(io_service_);
+ acceptor_.async_accept(*socket, std::bind(&server_base::accept_connection, this, _1, socket));
+ }
+