mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 16:27:27 +00:00
rocksdb: upgrade 6.5.2 -> 6.6.4
0001-Fix-build-breakage-from-lock_guard-error-6161.patch removed since it is included in 6.6.4 Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
-36
@@ -1,36 +0,0 @@
|
|||||||
From b626703de7ece507f360507e49d3ecb448b12e07 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Maysam Yabandeh <myabandeh@fb.com>
|
|
||||||
Date: Thu, 12 Dec 2019 13:48:50 -0800
|
|
||||||
Subject: [PATCH] Fix build breakage from lock_guard error (#6161)
|
|
||||||
|
|
||||||
Summary:
|
|
||||||
This change fixes a source issue that caused compile time error which breaks build for many fbcode services in that setup. The size() member function of channel is a const member, so member variables accessed within it are implicitly const as well. This caused error when clang fails to resolve to a constructor that takes std::mutex because the suitable constructor got rejected due to loss of constness for its argument. The fix is to add mutable modifier to the lock_ member of channel.
|
|
||||||
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6161
|
|
||||||
|
|
||||||
Differential Revision: D18967685
|
|
||||||
|
|
||||||
Pulled By: maysamyabandeh
|
|
||||||
|
|
||||||
Upstream-Status: Backport
|
|
||||||
|
|
||||||
fbshipit-source-id: 698b6a5153c3c92eeacb842c467aa28cc350d432
|
|
||||||
---
|
|
||||||
util/channel.h | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/util/channel.h b/util/channel.h
|
|
||||||
index 0225482c0..a8a47680a 100644
|
|
||||||
--- a/util/channel.h
|
|
||||||
+++ b/util/channel.h
|
|
||||||
@@ -60,7 +60,7 @@ class channel {
|
|
||||||
|
|
||||||
private:
|
|
||||||
std::condition_variable cv_;
|
|
||||||
- std::mutex lock_;
|
|
||||||
+ mutable std::mutex lock_;
|
|
||||||
std::queue<T> buffer_;
|
|
||||||
bool eof_;
|
|
||||||
};
|
|
||||||
--
|
|
||||||
2.24.1
|
|
||||||
|
|
||||||
@@ -6,12 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \
|
|||||||
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||||
file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837"
|
file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837"
|
||||||
|
|
||||||
SRCREV = "4cfbd87afd08a16df28436fb990ef6b154ee6114"
|
SRCREV = "551a110918493a19d11243f53408b97485de1411"
|
||||||
SRCBRANCH = "6.5.fb"
|
SRCBRANCH = "6.6.fb"
|
||||||
PV = "6.5.2"
|
PV = "6.6.4"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \
|
SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \
|
||||||
file://0001-Fix-build-breakage-from-lock_guard-error-6161.patch \
|
|
||||||
file://0001-db-write_thread.cc-Initialize-state.patch \
|
file://0001-db-write_thread.cc-Initialize-state.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user