Skip to content

Commit 6d58c2f

Browse files
daverigbyudkyo
authored andcommitted
CBD-6348: [BP] Changes required for folly v2022.02.14.00
This is a cherry-pick from trinity, but the ChangeID is changed to allow linking with the tlm change Folly v2022.02.14.00 has removed the method getUniquePtr(), replaced with as_lock(). Unfortunately our previous version of folly (v2020.09.07.00) did not yet have the as_lock() function, so we cannot update kv_engine in advance of the folly update - we must change the method in lock-step with the upgrade. Change-Id: If7fd9aea96f4c23092009a985d0ad0d839aac596 Reviewed-on: https://review.couchbase.org/c/kv_engine/+/234760 Reviewed-by: Trond Norbye <[email protected]> Well-Formed: Restriction Checker Tested-by: Trond Norbye <[email protected]>
1 parent 1a51e51 commit 6d58c2f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

programs/engine_testapp/mock_server.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ cb::engine_errc mock_waitfor_cookie(const CookieIface* cookie) {
252252
// Using at() here as the cookie should have been registered in
253253
// cookieNotifications when it was created.
254254
auto locked = cookieNotifications.lock();
255-
cookieNotificationSignal.wait(locked.getUniqueLock(), [&locked, cookie] {
255+
cookieNotificationSignal.wait(locked.as_lock(), [&locked, cookie] {
256256
return !locked->at(cookie).empty();
257257
});
258258
auto& notificationQueue = (*locked)[cookie];

0 commit comments

Comments
 (0)