diff options
Diffstat (limited to 'meta-oe/recipes-extended/minifi-cpp/files/remove_const_due_to_std_lock_guard.patch')
-rw-r--r-- | meta-oe/recipes-extended/minifi-cpp/files/remove_const_due_to_std_lock_guard.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/remove_const_due_to_std_lock_guard.patch b/meta-oe/recipes-extended/minifi-cpp/files/remove_const_due_to_std_lock_guard.patch deleted file mode 100644 index 365dec9d4..000000000 --- a/meta-oe/recipes-extended/minifi-cpp/files/remove_const_due_to_std_lock_guard.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From bfce136fa9ff1e955928539484ba4dd55f98f05b Mon Sep 17 00:00:00 2001 | ||
2 | From: Willem Jan Withagen <wjw@digiware.nl> | ||
3 | Date: Sun, 16 Aug 2020 23:38:55 +0200 | ||
4 | Subject: [PATCH] Update channel.h | ||
5 | |||
6 | Compiling this on FreeBSD with CLang fails due to: | ||
7 | ```In file included from /usr/ports/net/ceph15/work/ceph-15.2.4/src/rocksdb/utilities/backupable/backupable_db.cc:16: | ||
8 | /usr/ports/net/ceph15/work/ceph-15.2.4/src/rocksdb/util/channel.h:35:33: error: no matching constructor for initialization of 'std::lock_guard<std::mutex>' | ||
9 | std::lock_guard<std::mutex> lk(lock_); | ||
10 | ^ ~~~~~ | ||
11 | /usr/include/c++/v1/__mutex_base:90:14: note: candidate constructor not viable: 1st argument ('const std::mutex') would lose const qualifier | ||
12 | explicit lock_guard(mutex_type& __m) _LIBCPP_THREAD_SAFETY_ANNOTATION(acquire_capability(__m)) | ||
13 | ^ | ||
14 | /usr/include/c++/v1/__mutex_base:100:5: note: candidate constructor not viable: no known conversion from 'const std::mutex' to 'const std::__1::lock_guard<std::__1::mutex>' for 1st argument | ||
15 | lock_guard(lock_guard const&) _LIBCPP_EQUAL_DELETE; | ||
16 | ^ | ||
17 | /usr/include/c++/v1/__mutex_base:94:5: note: candidate constructor not viable: requires 2 arguments, but 1 was provided | ||
18 | lock_guard(mutex_type& __m, adopt_lock_t) _LIBCPP_THREAD_SAFETY_ANNOTATION(requires_capability(__m)) | ||
19 | ^ | ||
20 | 1 error generated. | ||
21 | ``` | ||
22 | --- | ||
23 | Upstream-Status: Pending | ||
24 | |||
25 | thirdparty/rocksdb/util/channel.h | 2 +- | ||
26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/thirdparty/rocksdb/util/channel.h b/thirdparty/rocksdb/util/channel.h | ||
29 | index 705fa2d28f..993bef5bc0 100644 | ||
30 | --- a/thirdparty/rocksdb/util/channel.h | ||
31 | +++ b/thirdparty/rocksdb/util/channel.h | ||
32 | @@ -31,7 +31,7 @@ class channel { | ||
33 | return buffer_.empty() && eof_; | ||
34 | } | ||
35 | |||
36 | - size_t size() const { | ||
37 | + size_t size() { | ||
38 | std::lock_guard<std::mutex> lk(lock_); | ||
39 | return buffer_.size(); | ||
40 | } | ||