diff options
| author | warptangent <warptangent@inbox.com> | 2015-05-25 22:07:17 -0700 |
|---|---|---|
| committer | warptangent <warptangent@inbox.com> | 2015-05-25 22:18:36 -0700 |
| commit | 696225321f26c0754f0ae60d18201e375fb6ff82 (patch) | |
| tree | 6c0e757bf6394b323e9c4d1de2678512e50565ec /contrib | |
| parent | Merge pull request #290 (diff) | |
| download | monero-696225321f26c0754f0ae60d18201e375fb6ff82.tar.xz | |
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.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/epee/include/storages/portable_storage.h | 2 |
1 files changed, 1 insertions, 1 deletions
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<section>)) - return nullptr; + return false; array_entry_t<section>& sec_array = boost::get<array_entry_t<section>>(*hsec_array); h_child_section = sec_array.get_next_val(); if(!h_child_section) |