patch lambda capture issue for @1.1906.1, fixed in upstream faodel@master (#16935)

This commit is contained in:
eugeneswalker 2020-06-03 11:38:27 -07:00 committed by GitHub
parent 3347ef2de4
commit 0086c47546
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 0 deletions

View file

@ -0,0 +1,26 @@
From f0267fc728d0f49ad396b83e8e62fba54027f31f Mon Sep 17 00:00:00 2001
From: Craig Ulmer <craig@craigulmer.com>
Date: Fri, 29 May 2020 23:08:29 -0700
Subject: [PATCH] FIX: Removes variable from lambda capture that conflicted
with args
---
src/kelpie/pools/DHTPool/DHTPool.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kelpie/pools/DHTPool/DHTPool.cpp b/src/kelpie/pools/DHTPool/DHTPool.cpp
index df9c1d3..d24aa89 100644
--- a/src/kelpie/pools/DHTPool/DHTPool.cpp
+++ b/src/kelpie/pools/DHTPool/DHTPool.cpp
@@ -229,7 +229,7 @@ rc_t DHTPool::Need(const Key &key, size_t expected_ldo_user_bytes, lunasa::DataO
bool is_found=false;
rc_t rc = Want(key, expected_ldo_user_bytes,
- [&key, &returned_ldo, &cv, &is_found] (bool success, Key key, lunasa::DataObject result_ldo,
+ [&returned_ldo, &cv, &is_found] (bool success, Key key, lunasa::DataObject result_ldo,
const kv_row_info_t &ri, const kv_col_info_t &c) {
if(success) {
*returned_ldo = result_ldo;
--
2.24.2 (Apple Git-127)

View file

@ -55,6 +55,7 @@ class Faodel(CMakePackage):
patch('faodel_mpi.patch', when='@1.1811.1 ~mpi') patch('faodel_mpi.patch', when='@1.1811.1 ~mpi')
# FAODEL Github issue #5 # FAODEL Github issue #5
patch('faodel_sbl.patch', when='@1.1811.1 logging=sbl') patch('faodel_sbl.patch', when='@1.1811.1 logging=sbl')
patch('lambda-capture-f0267fc.patch', when='@1.1906.1')
def cmake_args(self): def cmake_args(self):
spec = self.spec spec = self.spec