diff options
| -rw-r--r-- | searchlib/src/vespa/searchlib/attribute/enum_store_dictionary.cpp | 2 | ||||
| -rw-r--r-- | vespalib/src/vespa/vespalib/datastore/unique_store_dictionary.hpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/enum_store_dictionary.cpp b/searchlib/src/vespa/searchlib/attribute/enum_store_dictionary.cpp index 18e34c89ad0..6605c7ad704 100644 --- a/searchlib/src/vespa/searchlib/attribute/enum_store_dictionary.cpp +++ b/searchlib/src/vespa/searchlib/attribute/enum_store_dictionary.cpp @@ -228,7 +228,7 @@ EnumStoreDictionary<DictionaryT, UnorderedDictionaryT>::sync_unordered_after_loa if constexpr (has_unordered_dictionary) { for (auto itr = this->_dict.begin(); itr.valid(); ++itr) { EntryRef ref(itr.getKey()); - std::function<EntryRef(void)> insert_unordered_entry([ref]() -> EntryRef { return ref; }); + std::function<EntryRef(void)> insert_unordered_entry([ref]() noexcept -> EntryRef { return ref; }); auto& add_result = this->_unordered_dict.add(this->_unordered_dict.get_default_comparator(), ref, insert_unordered_entry); assert(add_result.first.load_relaxed() == ref); add_result.second.store_relaxed(EntryRef(itr.getData())); diff --git a/vespalib/src/vespa/vespalib/datastore/unique_store_dictionary.hpp b/vespalib/src/vespa/vespalib/datastore/unique_store_dictionary.hpp index 63f9d09010b..963a2dc72a1 100644 --- a/vespalib/src/vespa/vespalib/datastore/unique_store_dictionary.hpp +++ b/vespalib/src/vespa/vespalib/datastore/unique_store_dictionary.hpp @@ -112,7 +112,7 @@ UniqueStoreDictionary<DictionaryT, ParentT, UnorderedDictionaryT>::add(const Ent EntryRef newRef = insertEntry(); _dict.insert(itr, newRef, DataType()); if constexpr (has_unordered_dictionary) { - std::function<EntryRef(void)> insert_unordered_entry([newRef]() -> EntryRef { return newRef; }); + std::function<EntryRef(void)> insert_unordered_entry([newRef]() noexcept -> EntryRef { return newRef; }); auto& add_result = this->_unordered_dict.add(comp, newRef, insert_unordered_entry); assert(add_result.first.load_relaxed() == newRef); } @@ -210,7 +210,7 @@ UniqueStoreDictionary<DictionaryT, ParentT, UnorderedDictionaryT>::build(vespali for (size_t i = 1; i < refs.size(); ++i) { if (ref_counts[i] != 0u) { EntryRef ref = refs[i]; - std::function<EntryRef(void)> insert_unordered_entry([ref]() -> EntryRef { return ref; }); + std::function<EntryRef(void)> insert_unordered_entry([ref]() noexcept -> EntryRef { return ref; }); auto& add_result = this->_unordered_dict.add(this->_unordered_dict.get_default_comparator(), ref, insert_unordered_entry); assert(add_result.first.load_relaxed() == ref); } @@ -229,7 +229,7 @@ UniqueStoreDictionary<DictionaryT, ParentT, UnorderedDictionaryT>::build(vespali _dict.assign(builder); if constexpr (has_unordered_dictionary) { for (const auto& ref : refs) { - std::function<EntryRef(void)> insert_unordered_entry([ref]() -> EntryRef { return ref; }); + std::function<EntryRef(void)> insert_unordered_entry([ref]() noexcept -> EntryRef { return ref; }); auto& add_result = this->_unordered_dict.add(this->_unordered_dict.get_default_comparator(), ref, insert_unordered_entry); assert(add_result.first.load_relaxed() == ref); } @@ -254,7 +254,7 @@ UniqueStoreDictionary<DictionaryT, ParentT, UnorderedDictionaryT>::build_with_pa if constexpr (has_unordered_dictionary) { for (size_t i = 0; i < refs.size(); ++i) { EntryRef ref = refs[i]; - std::function<EntryRef(void)> insert_unordered_entry([ref]() -> EntryRef { return ref; }); + std::function<EntryRef(void)> insert_unordered_entry([ref]() noexcept -> EntryRef { return ref; }); auto& add_result = this->_unordered_dict.add(this->_unordered_dict.get_default_comparator(), ref, insert_unordered_entry); assert(add_result.first.load_relaxed() == refs[i]); if constexpr (std::is_same_v<DataType, uint32_t>) { |