From 696225321f26c0754f0ae60d18201e375fb6ff82 Mon Sep 17 00:00:00 2001 From: warptangent Date: Mon, 25 May 2015 22:07:17 -0700 Subject: Fix compile for GCC 5.1.0 Add fix for compile error with multiple uses of peerid_type (uint64_t) variable in lambda expression. - known GCC issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65843 epee: replace return value of nullptr for expected boolean with false. Fixes #231. --- contrib/epee/include/storages/portable_storage.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/epee/include') diff --git a/contrib/epee/include/storages/portable_storage.h b/contrib/epee/include/storages/portable_storage.h index bbfe5f85c..ba9292306 100644 --- a/contrib/epee/include/storages/portable_storage.h +++ b/contrib/epee/include/storages/portable_storage.h @@ -427,7 +427,7 @@ namespace epee TRY_ENTRY(); CHECK_AND_ASSERT(hsec_array, false); if(hsec_array->type() != typeid(array_entry_t
)) - return nullptr; + return false; array_entry_t
& sec_array = boost::get>(*hsec_array); h_child_section = sec_array.get_next_val(); if(!h_child_section) -- cgit v1.2.3