diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-31 19:16:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-31 19:16:04 +0100 |
commit | be5e83c4bc21d0485fc3c1f632a3194117889fb1 (patch) | |
tree | 6b5cfaff1ce10a8e4da513b147c45a672bf4d30a | |
parent | e45b047d1c831488c7a0e0551b2301e524833887 (diff) | |
parent | fc7a0cc32ca9c956321d1c483214f3f57605f618 (diff) |
Merge pull request #25824 from vespa-engine/toregge/add-noexcept-specifiers
Add noexcept specifiers required by gcc 12 on Darwin 22.3.
9 files changed, 19 insertions, 16 deletions
diff --git a/searchlib/src/tests/queryeval/nearest_neighbor/nearest_neighbor_test.cpp b/searchlib/src/tests/queryeval/nearest_neighbor/nearest_neighbor_test.cpp index 03cf22af2de..2801bf90080 100644 --- a/searchlib/src/tests/queryeval/nearest_neighbor/nearest_neighbor_test.cpp +++ b/searchlib/src/tests/queryeval/nearest_neighbor/nearest_neighbor_test.cpp @@ -188,18 +188,18 @@ struct TestParam { vespalib::string attribute_tensor_type_spec; vespalib::string query_tensor_type_spec; TestParam(const vespalib::string& attribute_tensor_type_spec_in, - const vespalib::string& query_tensor_type_spec_in) + const vespalib::string& query_tensor_type_spec_in) noexcept : attribute_tensor_type_spec(attribute_tensor_type_spec_in), query_tensor_type_spec(query_tensor_type_spec_in) {} - TestParam(const TestParam &); + TestParam(const TestParam &) noexcept; TestParam & operator=(TestParam &) noexcept = delete; TestParam(TestParam &&) noexcept = default; TestParam & operator=(TestParam &&) noexcept = default; ~TestParam(); }; -TestParam::TestParam(const TestParam &) = default; +TestParam::TestParam(const TestParam &) noexcept = default; TestParam::~TestParam() = default; std::ostream& operator<<(std::ostream& os, const TestParam& param) diff --git a/searchlib/src/tests/tensor/hnsw_index/hnsw_index_test.cpp b/searchlib/src/tests/tensor/hnsw_index/hnsw_index_test.cpp index dd248b07fff..a3f07959094 100644 --- a/searchlib/src/tests/tensor/hnsw_index/hnsw_index_test.cpp +++ b/searchlib/src/tests/tensor/hnsw_index/hnsw_index_test.cpp @@ -768,7 +768,7 @@ class MyGlobalFilter : public GlobalFilter { std::shared_ptr<GlobalFilter> _filter; mutable uint32_t _max_docid; public: - MyGlobalFilter(std::shared_ptr<GlobalFilter> filter) + MyGlobalFilter(std::shared_ptr<GlobalFilter> filter) noexcept : _filter(std::move(filter)), _max_docid(0) { diff --git a/searchlib/src/vespa/searchlib/common/converters.h b/searchlib/src/vespa/searchlib/common/converters.h index 718f575b4e8..2c076fb5eed 100644 --- a/searchlib/src/vespa/searchlib/common/converters.h +++ b/searchlib/src/vespa/searchlib/common/converters.h @@ -16,7 +16,7 @@ private: class LowercaseConverter : public BlobConverter { public: - LowercaseConverter(); + LowercaseConverter() noexcept; private: ConstBufferRef onConvert(const ConstBufferRef & src) const override; mutable vespalib::string _buffer; diff --git a/searchlib/src/vespa/searchlib/common/sortspec.cpp b/searchlib/src/vespa/searchlib/common/sortspec.cpp index 16f0c884535..00de3111ac9 100644 --- a/searchlib/src/vespa/searchlib/common/sortspec.cpp +++ b/searchlib/src/vespa/searchlib/common/sortspec.cpp @@ -16,8 +16,8 @@ PassThroughConverter::onConvert(const ConstBufferRef & src) const return src; } -LowercaseConverter::LowercaseConverter() : - _buffer() +LowercaseConverter::LowercaseConverter() noexcept + : _buffer() { } diff --git a/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp b/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp index f552c35e941..542b6f5f6eb 100644 --- a/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp @@ -60,7 +60,7 @@ private: const uint32_t _fieldId; const bool _valid; public: - FieldHandle(const Schema &schema, uint32_t fieldId, IndexBuilder & builder, bool valid); + FieldHandle(const Schema &schema, uint32_t fieldId, IndexBuilder & builder, bool valid) noexcept; ~FieldHandle(); void new_word(vespalib::stringref word); @@ -126,7 +126,7 @@ FileHandle::close() (void) ret; } -IndexBuilder::FieldHandle::FieldHandle(const Schema &schema, uint32_t fieldId, IndexBuilder &builder, bool valid) +IndexBuilder::FieldHandle::FieldHandle(const Schema &schema, uint32_t fieldId, IndexBuilder &builder, bool valid) noexcept : _schema(schema), _builder(builder), _file(), diff --git a/searchlib/src/vespa/searchlib/queryeval/global_filter.cpp b/searchlib/src/vespa/searchlib/queryeval/global_filter.cpp index 3ef28b461b8..2d88883780a 100644 --- a/searchlib/src/vespa/searchlib/queryeval/global_filter.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/global_filter.cpp @@ -24,16 +24,19 @@ struct Inactive : GlobalFilter { struct EmptyFilter : GlobalFilter { uint32_t docid_limit; - EmptyFilter(uint32_t docid_limit_in) : docid_limit(docid_limit_in) {} + EmptyFilter(uint32_t docid_limit_in) noexcept : docid_limit(docid_limit_in) {} + ~EmptyFilter() override; bool is_active() const override { return true; } uint32_t size() const override { return docid_limit; } uint32_t count() const override { return 0; } bool check(uint32_t) const override { return false; } }; +EmptyFilter::~EmptyFilter() = default; + struct BitVectorFilter : public GlobalFilter { std::unique_ptr<BitVector> vector; - BitVectorFilter(std::unique_ptr<BitVector> vector_in) + BitVectorFilter(std::unique_ptr<BitVector> vector_in) noexcept : vector(std::move(vector_in)) {} bool is_active() const override { return true; } uint32_t size() const override { return vector->size(); } @@ -49,7 +52,7 @@ struct MultiBitVectorFilter : public GlobalFilter { MultiBitVectorFilter(std::vector<std::unique_ptr<BitVector>> vectors_in, std::vector<uint32_t> splits_in, uint32_t total_size_in, - uint32_t total_count_in) + uint32_t total_count_in) noexcept : vectors(std::move(vectors_in)), splits(std::move(splits_in)), total_size(total_size_in), @@ -105,7 +108,7 @@ struct MakePart : Runnable { } -GlobalFilter::GlobalFilter() = default; +GlobalFilter::GlobalFilter() noexcept = default; GlobalFilter::~GlobalFilter() = default; std::shared_ptr<GlobalFilter> diff --git a/searchlib/src/vespa/searchlib/queryeval/global_filter.h b/searchlib/src/vespa/searchlib/queryeval/global_filter.h index acae2bf6297..66f85299dd1 100644 --- a/searchlib/src/vespa/searchlib/queryeval/global_filter.h +++ b/searchlib/src/vespa/searchlib/queryeval/global_filter.h @@ -22,7 +22,7 @@ class Blueprint; class GlobalFilter : public std::enable_shared_from_this<GlobalFilter> { public: - GlobalFilter(); + GlobalFilter() noexcept; GlobalFilter(const GlobalFilter &) = delete; GlobalFilter(GlobalFilter &&) = delete; virtual bool is_active() const = 0; diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp index 8f3fa8d0d54..8a3226ee52a 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp +++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp @@ -57,7 +57,7 @@ GetDocsumsStateCallback::set_matching_elements_filler(std::unique_ptr<IMatchingE GetDocsumsStateCallback::~GetDocsumsStateCallback() = default; -DocsumTools::FieldSpec::FieldSpec() : +DocsumTools::FieldSpec::FieldSpec() noexcept : _outputName(), _inputNames(), _command(VsmsummaryConfig::Fieldmap::Command::NONE) diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h index 36bf3a923f6..77ed9573e54 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h +++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h @@ -53,7 +53,7 @@ public: VsmsummaryConfig::Fieldmap::Command _command; public: - FieldSpec(); + FieldSpec() noexcept; ~FieldSpec(); const vespalib::string & getOutputName() const { return _outputName; } void setOutputName(const vespalib::string & name) { _outputName = name; } |