summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/minifi-cpp/files
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2024-05-28 22:35:07 -0700
committerKhem Raj <raj.khem@gmail.com>2024-05-30 08:42:02 -0700
commita47a40a3e4d19de30d1147a37192dc816b236a79 (patch)
tree5294a836d6798055d79e755a1792104e24854ec2 /meta-oe/recipes-extended/minifi-cpp/files
parent31cdde863477b82ffc9a0b401eccdd0dec57005a (diff)
downloadmeta-openembedded-a47a40a3e4d19de30d1147a37192dc816b236a79.tar.gz
minifi-cpp: Fix build with clang and riscv32
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/minifi-cpp/files')
-rw-r--r--meta-oe/recipes-extended/minifi-cpp/files/0001-libminifi-Rename-mutex_-to-mtx_-member-of-Concurrent.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0001-libminifi-Rename-mutex_-to-mtx_-member-of-Concurrent.patch b/meta-oe/recipes-extended/minifi-cpp/files/0001-libminifi-Rename-mutex_-to-mtx_-member-of-Concurrent.patch
new file mode 100644
index 0000000000..a09a17bf2c
--- /dev/null
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0001-libminifi-Rename-mutex_-to-mtx_-member-of-Concurrent.patch
@@ -0,0 +1,37 @@
1From cd2b5362fe2e63dff3666ce72da27979fe06a519 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 28 May 2024 22:24:52 -0700
4Subject: [PATCH] libminifi: Rename mutex_ to mtx_ member of ConcurrentQueue
5
6Fixes
7libminifi/include/utils/MinifiConcurrentQueue.h:48:75: error: no member named 'mutex_' in 'ConcurrentQueue<T>'; did you mean 'mtx_'?
8| 48 | : ConcurrentQueue(std::move(other), std::lock_guard<std::mutex>(other.mutex_)) {}
9| | ^~~~~~
10| | mtx_
11| libminifi/include/utils/MinifiConcurrentQueue.h:140:22: note: 'mtx_' declared here
12| 140 | mutable std::mutex mtx_;
13| | ^
14| 1 error generated.
15
16Upstream-Status: Submitted [https://github.com/apache/nifi-minifi-cpp/pull/1803]
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18---
19 libminifi/include/utils/MinifiConcurrentQueue.h | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/libminifi/include/utils/MinifiConcurrentQueue.h b/libminifi/include/utils/MinifiConcurrentQueue.h
23index 8abc0ec93..1db58080b 100644
24--- a/libminifi/include/utils/MinifiConcurrentQueue.h
25+++ b/libminifi/include/utils/MinifiConcurrentQueue.h
26@@ -45,7 +45,7 @@ class ConcurrentQueue {
27 ConcurrentQueue(const ConcurrentQueue& other) = delete;
28 ConcurrentQueue& operator=(const ConcurrentQueue& other) = delete;
29 ConcurrentQueue(ConcurrentQueue&& other)
30- : ConcurrentQueue(std::move(other), std::lock_guard<std::mutex>(other.mutex_)) {}
31+ : ConcurrentQueue(std::move(other), std::lock_guard<std::mutex>(other.mtx_)) {}
32
33 ConcurrentQueue& operator=(ConcurrentQueue&& other) {
34 if (this != &other) {
35--
362.45.1
37