KEP-1012: second attempt to fix osx build error

bluzelle · Jan 31, 2019 · 35fcb67 · 35fcb67
1 parent 294fa31
commit 35fcb67
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/storage/mem_storage.cpp b/storage/mem_storage.cpp
@@ -301,7 +301,7 @@ mem_storage::do_if(const bzn::uuid_t& uuid, const std::string& first, const std:
         auto end_it = last.empty() ? inner_db->second.end() : inner_db->second.lower_bound(last);
         for (auto it = inner_db->second.lower_bound(first); it != inner_db->second.end() && it != end_it; it++)
         {
-            if (!predicate || predicate.value()(it->first, it->second))
+            if (!predicate || (*predicate)(it->first, it->second))
             {
                 action(it->first, it->second);
             }

diff --git a/storage/rocksdb_storage.cpp b/storage/rocksdb_storage.cpp
@@ -421,7 +421,7 @@ rocksdb_storage::do_if(const bzn::uuid_t& uuid, const std::string& first, const
     for (iter->Seek(start_key); iter->Valid() && iter->key().starts_with(uuid) && iter->key().ToString() >= start_key
         && (end_key.empty() || iter->key().ToString() < end_key); iter->Next())
     {
-        if (!predicate || predicate.value()(iter->key().ToString().substr(uuid.size()), iter->value().ToString()))
+        if (!predicate || (*predicate)(iter->key().ToString().substr(uuid.size()), iter->value().ToString()))
         {
             action(iter->key().ToString().substr(uuid.size()), iter->value().ToString());
         }