diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2020-08-10 10:47:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-10 10:47:54 +0200 |
commit | 2e052e1c73cccf8a0e0cd73ee498c6fc146bcf42 (patch) | |
tree | 701ab351ecdd3128672b5e5d765ebdf0d2e81a38 | |
parent | f4d70dae398a0b497e6c90c47b52439b43698d30 (diff) | |
parent | 2f21ca67cae98a4f26a46537de7fdc0d0de81273 (diff) | |
download | meta-updater-2e052e1c73cccf8a0e0cd73ee498c6fc146bcf42.tar.gz |
Merge pull request #761 from psaavedra/dunfell
Remove boost 1.72 bbappend
-rw-r--r-- | recipes-support/boost/boost_1.72.0.bbappend | 4 | ||||
-rw-r--r-- | recipes-support/boost/files/0001-add-typedef-executor_type.patch | 56 |
2 files changed, 0 insertions, 60 deletions
diff --git a/recipes-support/boost/boost_1.72.0.bbappend b/recipes-support/boost/boost_1.72.0.bbappend deleted file mode 100644 index 73ee73d..0000000 --- a/recipes-support/boost/boost_1.72.0.bbappend +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
2 | |||
3 | SRC_URI += "file://0001-add-typedef-executor_type.patch \ | ||
4 | " | ||
diff --git a/recipes-support/boost/files/0001-add-typedef-executor_type.patch b/recipes-support/boost/files/0001-add-typedef-executor_type.patch deleted file mode 100644 index 1b326a4..0000000 --- a/recipes-support/boost/files/0001-add-typedef-executor_type.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | From 99ad3ebac0b7466d57c98fb9583fbe8789729691 Mon Sep 17 00:00:00 2001 | ||
2 | From: Patrick Vacek <patrickvacek@gmail.com> | ||
3 | Date: Wed, 4 Mar 2020 12:41:02 +0000 | ||
4 | Subject: [PATCH] add typedef executor_type | ||
5 | |||
6 | Backported from here: | ||
7 | https://github.com/boostorg/process/commit/6a4d2ff72114ef47c7afaf92e1042aca3dfa41b0 | ||
8 | |||
9 | Suggested-by: Kostiantyn Bushko <kbushko@intellias.com> | ||
10 | Signed-off-by: Patrick Vacek <patrickvacek@gmail.com> | ||
11 | --- | ||
12 | boost/process/async_pipe.hpp | 2 ++ | ||
13 | boost/process/detail/posix/async_pipe.hpp | 1 + | ||
14 | boost/process/detail/windows/async_pipe.hpp | 1 + | ||
15 | 3 files changed, 4 insertions(+) | ||
16 | |||
17 | diff --git a/boost/process/async_pipe.hpp b/boost/process/async_pipe.hpp | ||
18 | index 101fe1d..a562432 100644 | ||
19 | --- a/boost/process/async_pipe.hpp | ||
20 | +++ b/boost/process/async_pipe.hpp | ||
21 | @@ -47,6 +47,8 @@ public: | ||
22 | */ | ||
23 | typedef platform_specific handle_type; | ||
24 | |||
25 | + typedef typename handle_type::executor_type executor_type; | ||
26 | + | ||
27 | /** Construct a new async_pipe, does automatically open the pipe. | ||
28 | * Initializes source and sink with the same io_context. | ||
29 | * @note Windows creates a named pipe here, where the name is automatically generated. | ||
30 | diff --git a/boost/process/detail/posix/async_pipe.hpp b/boost/process/detail/posix/async_pipe.hpp | ||
31 | index 725a078..a82c057 100644 | ||
32 | --- a/boost/process/detail/posix/async_pipe.hpp | ||
33 | +++ b/boost/process/detail/posix/async_pipe.hpp | ||
34 | @@ -23,6 +23,7 @@ class async_pipe | ||
35 | public: | ||
36 | typedef int native_handle_type; | ||
37 | typedef ::boost::asio::posix::stream_descriptor handle_type; | ||
38 | + typedef typename handle_type::executor_type executor_type; | ||
39 | |||
40 | inline async_pipe(boost::asio::io_context & ios) : async_pipe(ios, ios) {} | ||
41 | |||
42 | diff --git a/boost/process/detail/windows/async_pipe.hpp b/boost/process/detail/windows/async_pipe.hpp | ||
43 | index 06d5f2d..0b447f9 100644 | ||
44 | --- a/boost/process/detail/windows/async_pipe.hpp | ||
45 | +++ b/boost/process/detail/windows/async_pipe.hpp | ||
46 | @@ -48,6 +48,7 @@ class async_pipe | ||
47 | public: | ||
48 | typedef ::boost::winapi::HANDLE_ native_handle_type; | ||
49 | typedef ::boost::asio::windows::stream_handle handle_type; | ||
50 | + typedef typename handle_type::executor_type executor_type; | ||
51 | |||
52 | async_pipe(boost::asio::io_context & ios) : async_pipe(ios, ios, make_pipe_name(), true) {} | ||
53 | async_pipe(boost::asio::io_context & ios_source, boost::asio::io_context & ios_sink) | ||
54 | -- | ||
55 | 2.11.0 | ||
56 | |||