From acab8b45f64302a307d37b3fada571a61a8c5649 Mon Sep 17 00:00:00 2001 From: Jan Date: Fri, 4 May 2018 11:55:53 +0200 Subject: [PATCH] add missing override specifiers (#5262) --- .../core/analysis/token_attributes.hpp | 2 +- .../iresearch/core/formats/formats_10.cpp | 10 +++---- .../core/formats/formats_10_attributes.hpp | 2 +- .../iresearch/core/index/index_reader.hpp | 2 +- 3rdParty/iresearch/core/index/iterators.cpp | 14 +++++----- .../core/index/transaction_store.cpp | 4 +-- 3rdParty/iresearch/core/iql/query_builder.cpp | 4 +-- 3rdParty/iresearch/core/search/bm25.hpp | 2 +- .../iresearch/core/search/boolean_filter.hpp | 2 +- 3rdParty/iresearch/core/search/tfidf.hpp | 4 +-- 3rdParty/iresearch/core/store/data_input.hpp | 18 ++++++------ 3rdParty/iresearch/core/store/data_output.hpp | 12 ++++---- .../iresearch/core/store/fs_directory.cpp | 8 +++--- .../iresearch/core/store/mmap_directory.hpp | 2 +- 3rdParty/iresearch/core/store/store_utils.hpp | 28 +++++++++---------- 3rdParty/iresearch/core/utils/fst_matcher.hpp | 24 ++++++++-------- 3rdParty/iresearch/core/utils/iterator.hpp | 6 ++-- 17 files changed, 72 insertions(+), 72 deletions(-) diff --git a/3rdParty/iresearch/core/analysis/token_attributes.hpp b/3rdParty/iresearch/core/analysis/token_attributes.hpp index ca6bcdeec1..3551d54cf8 100644 --- a/3rdParty/iresearch/core/analysis/token_attributes.hpp +++ b/3rdParty/iresearch/core/analysis/token_attributes.hpp @@ -184,7 +184,7 @@ class IRESEARCH_API position : public attribute { explicit impl(size_t reserve_attrs); virtual void clear() = 0; - const attribute_view& attributes() const NOEXCEPT { + const attribute_view& attributes() const NOEXCEPT override { return attrs_; } diff --git a/3rdParty/iresearch/core/formats/formats_10.cpp b/3rdParty/iresearch/core/formats/formats_10.cpp index 87b852ac96..55d82b6074 100644 --- a/3rdParty/iresearch/core/formats/formats_10.cpp +++ b/3rdParty/iresearch/core/formats/formats_10.cpp @@ -1096,9 +1096,9 @@ class pos_doc_iterator : public doc_iterator { const irs::attribute_view& attrs, const index_input* pos_in, const index_input* pay_in - ) final; + ) override final; - virtual void seek_notify(const skip_context &ctx) final { + virtual void seek_notify(const skip_context &ctx) override final { assert(pos_); // notify positions pos_->prepare(ctx); @@ -3077,8 +3077,8 @@ class column_iterator final: public irs::doc_iterator { struct payload_iterator: public irs::payload_iterator { const irs::bytes_ref* value_{ nullptr }; - virtual bool next() { return nullptr != value_; } - virtual const irs::bytes_ref& value() const { + virtual bool next() override { return nullptr != value_; } + virtual const irs::bytes_ref& value() const override { return value_ ? *value_ : irs::bytes_ref::NIL; } }; @@ -4564,4 +4564,4 @@ NS_END /* root */ // ----------------------------------------------------------------------------- // --SECTION-- END-OF-FILE -// ----------------------------------------------------------------------------- \ No newline at end of file +// ----------------------------------------------------------------------------- diff --git a/3rdParty/iresearch/core/formats/formats_10_attributes.hpp b/3rdParty/iresearch/core/formats/formats_10_attributes.hpp index 5284a0a79f..ef806e56bc 100644 --- a/3rdParty/iresearch/core/formats/formats_10_attributes.hpp +++ b/3rdParty/iresearch/core/formats/formats_10_attributes.hpp @@ -47,7 +47,7 @@ struct documents final : attribute { struct term_meta final : irs::term_meta { term_meta(): e_single_doc(0) {} // GCC 4.9 does not initialize unions properly - void clear() { + void clear() override { irs::term_meta::clear(); doc_start = pos_start = pay_start = 0; pos_end = type_limits::invalid(); diff --git a/3rdParty/iresearch/core/index/index_reader.hpp b/3rdParty/iresearch/core/index/index_reader.hpp index 30cf7a0355..b21a62225a 100644 --- a/3rdParty/iresearch/core/index/index_reader.hpp +++ b/3rdParty/iresearch/core/index/index_reader.hpp @@ -85,7 +85,7 @@ struct IRESEARCH_API sub_reader : index_reader { using index_reader::docs_count; // returns number of live documents by the specified field - virtual uint64_t docs_count(const string_ref& field) const { + virtual uint64_t docs_count(const string_ref& field) const override { const term_reader* rdr = this->field(field); return nullptr == rdr ? 0 : rdr->docs_count(); } diff --git a/3rdParty/iresearch/core/index/iterators.cpp b/3rdParty/iresearch/core/index/iterators.cpp index 9b8f89268f..138967cca7 100644 --- a/3rdParty/iresearch/core/index/iterators.cpp +++ b/3rdParty/iresearch/core/index/iterators.cpp @@ -77,28 +77,28 @@ struct empty_term_iterator : term_iterator { }; struct empty_term_reader : singleton, term_reader { - virtual iresearch::seek_term_iterator::ptr iterator() const { return nullptr; } - virtual const iresearch::field_meta& meta() const { + virtual iresearch::seek_term_iterator::ptr iterator() const override { return nullptr; } + virtual const iresearch::field_meta& meta() const override { return irs::field_meta::EMPTY; } - virtual const irs::attribute_view& attributes() const NOEXCEPT { + virtual const irs::attribute_view& attributes() const NOEXCEPT override { return irs::attribute_view::empty_instance(); } // total number of terms - virtual size_t size() const { return 0; } + virtual size_t size() const override { return 0; } // total number of documents - virtual uint64_t docs_count() const { return 0; } + virtual uint64_t docs_count() const override { return 0; } // less significant term - virtual const iresearch::bytes_ref& (min)() const { + virtual const iresearch::bytes_ref& (min)() const override { return iresearch::bytes_ref::NIL; } // most significant term - virtual const iresearch::bytes_ref& (max)() const { + virtual const iresearch::bytes_ref& (max)() const override { return iresearch::bytes_ref::NIL; } }; // empty_term_reader diff --git a/3rdParty/iresearch/core/index/transaction_store.cpp b/3rdParty/iresearch/core/index/transaction_store.cpp index 6c03c66adf..a310f1dc8b 100644 --- a/3rdParty/iresearch/core/index/transaction_store.cpp +++ b/3rdParty/iresearch/core/index/transaction_store.cpp @@ -413,7 +413,7 @@ class store_columnstore_iterator final: public store_doc_iterator_base { size_t offset_ = 0; // initially no data irs::bytes_ref value_; - virtual bool next() { + virtual bool next() override { if (!offset_) { value_ = irs::bytes_ref::NIL; @@ -433,7 +433,7 @@ class store_columnstore_iterator final: public store_doc_iterator_base { return true; } - virtual const irs::bytes_ref& value() const { return value_; } + virtual const irs::bytes_ref& value() const override { return value_; } }; payload_iterator doc_payload_; diff --git a/3rdParty/iresearch/core/iql/query_builder.cpp b/3rdParty/iresearch/core/iql/query_builder.cpp index 0944ea8c46..e50d563f8f 100644 --- a/3rdParty/iresearch/core/iql/query_builder.cpp +++ b/3rdParty/iresearch/core/iql/query_builder.cpp @@ -242,7 +242,7 @@ const irs::iql::query_builder::branch_builder_function_t SIMILAR_BRANCH_BUILDER const iresearch::index_reader&, const iresearch::order::prepared&, boost_t, - const iresearch::attribute_view&) const { + const iresearch::attribute_view&) const override { iresearch::filter::prepared::ptr result; // null-ptr result return result; } @@ -971,4 +971,4 @@ NS_END // NS_ROOT // ----------------------------------------------------------------------------- // --SECTION-- END-OF-FILE -// ----------------------------------------------------------------------------- \ No newline at end of file +// ----------------------------------------------------------------------------- diff --git a/3rdParty/iresearch/core/search/bm25.hpp b/3rdParty/iresearch/core/search/bm25.hpp index ee66bbc204..e7bdb1f704 100644 --- a/3rdParty/iresearch/core/search/bm25.hpp +++ b/3rdParty/iresearch/core/search/bm25.hpp @@ -65,7 +65,7 @@ class bm25_sort : public sort { return b_ == 0.f; } - virtual sort::prepared::ptr prepare() const; + virtual sort::prepared::ptr prepare() const override; private: float_t k_; // [1.2 .. 2.0] diff --git a/3rdParty/iresearch/core/search/boolean_filter.hpp b/3rdParty/iresearch/core/search/boolean_filter.hpp index d81720991b..d9363c536b 100644 --- a/3rdParty/iresearch/core/search/boolean_filter.hpp +++ b/3rdParty/iresearch/core/search/boolean_filter.hpp @@ -68,7 +68,7 @@ class IRESEARCH_API boolean_filter : public filter, private util::noncopyable { const order::prepared& ord, boost_t boost, const attribute_view& ctx - ) const final; + ) const override final; protected: boolean_filter(const type_id& type) NOEXCEPT; diff --git a/3rdParty/iresearch/core/search/tfidf.hpp b/3rdParty/iresearch/core/search/tfidf.hpp index 3cf375d746..071b0ed067 100644 --- a/3rdParty/iresearch/core/search/tfidf.hpp +++ b/3rdParty/iresearch/core/search/tfidf.hpp @@ -47,7 +47,7 @@ public: bool normalize() const { return normalize_; } void normalize(bool value) { normalize_ = value; } - virtual sort::prepared::ptr prepare() const; + virtual sort::prepared::ptr prepare() const override; private: bool normalize_; @@ -55,4 +55,4 @@ private: NS_END -#endif \ No newline at end of file +#endif diff --git a/3rdParty/iresearch/core/store/data_input.hpp b/3rdParty/iresearch/core/store/data_input.hpp index b66b4a69d2..c5f2da174f 100644 --- a/3rdParty/iresearch/core/store/data_input.hpp +++ b/3rdParty/iresearch/core/store/data_input.hpp @@ -137,29 +137,29 @@ class IRESEARCH_API buffered_index_input : public index_input { public: virtual ~buffered_index_input(); - virtual byte_type read_byte() final; + virtual byte_type read_byte() override final; - virtual size_t read_bytes(byte_type* b, size_t count) final; + virtual size_t read_bytes(byte_type* b, size_t count) override final; - virtual size_t file_pointer() const final { + virtual size_t file_pointer() const override final { return start_ + offset(); } - virtual bool eof() const final { + virtual bool eof() const override final { return file_pointer() >= length(); } - virtual void seek(size_t pos) final; + virtual void seek(size_t pos) override final; size_t buffer_size() const { return buf_size_; } - virtual int32_t read_int() final; + virtual int32_t read_int() override final; - virtual int64_t read_long() final; + virtual int64_t read_long() override final; - virtual uint32_t read_vint() final; + virtual uint32_t read_vint() override final; - virtual uint64_t read_vlong() final; + virtual uint64_t read_vlong() override final; protected: explicit buffered_index_input(size_t buf_size = 1024); diff --git a/3rdParty/iresearch/core/store/data_output.hpp b/3rdParty/iresearch/core/store/data_output.hpp index 731253297a..a9db957a5b 100644 --- a/3rdParty/iresearch/core/store/data_output.hpp +++ b/3rdParty/iresearch/core/store/data_output.hpp @@ -134,17 +134,17 @@ class IRESEARCH_API buffered_index_output : public index_output, util::noncopyab virtual size_t file_pointer() const override; - virtual void write_byte(byte_type b) final; + virtual void write_byte(byte_type b) override final; - virtual void write_bytes(const byte_type* b, size_t length) final; + virtual void write_bytes(const byte_type* b, size_t length) override final; - virtual void write_vint(uint32_t v) final; + virtual void write_vint(uint32_t v) override final; - virtual void write_vlong(uint64_t v) final; + virtual void write_vlong(uint64_t v) override final; - virtual void write_int(int32_t v) final; + virtual void write_int(int32_t v) override final; - virtual void write_long(int64_t v) final; + virtual void write_long(int64_t v) override final; protected: virtual void flush_buffer(const byte_type* b, size_t len) = 0; diff --git a/3rdParty/iresearch/core/store/fs_directory.cpp b/3rdParty/iresearch/core/store/fs_directory.cpp index d773000694..2e4b2dc121 100644 --- a/3rdParty/iresearch/core/store/fs_directory.cpp +++ b/3rdParty/iresearch/core/store/fs_directory.cpp @@ -252,7 +252,7 @@ class fs_index_output : public buffered_index_output { class pooled_fs_index_input; // predeclaration used by fs_index_input class fs_index_input : public buffered_index_input { public: - virtual int64_t checksum(size_t offset) const final { + virtual int64_t checksum(size_t offset) const override final { const auto begin = handle_->pos; const auto end = (std::min)(begin + offset, handle_->size); @@ -422,8 +422,8 @@ class pooled_fs_index_input final : public fs_index_input { public: explicit pooled_fs_index_input(const fs_index_input& in); virtual ~pooled_fs_index_input(); - virtual ptr dup() const NOEXCEPT; - virtual ptr reopen() const NOEXCEPT; + virtual ptr dup() const NOEXCEPT override; + virtual ptr reopen() const NOEXCEPT override; private: typedef unbounded_object_pool fd_pool_t; @@ -680,4 +680,4 @@ NS_END // ----------------------------------------------------------------------------- // --SECTION-- END-OF-FILE -// ----------------------------------------------------------------------------- \ No newline at end of file +// ----------------------------------------------------------------------------- diff --git a/3rdParty/iresearch/core/store/mmap_directory.hpp b/3rdParty/iresearch/core/store/mmap_directory.hpp index fdc53f5d48..f27e5f065a 100644 --- a/3rdParty/iresearch/core/store/mmap_directory.hpp +++ b/3rdParty/iresearch/core/store/mmap_directory.hpp @@ -38,7 +38,7 @@ class IRESEARCH_API mmap_directory : public fs_directory { virtual index_input::ptr open( const std::string& name, IOAdvice advice - ) const NOEXCEPT final; + ) const NOEXCEPT override final; }; // mmap_directory NS_END // ROOT diff --git a/3rdParty/iresearch/core/store/store_utils.hpp b/3rdParty/iresearch/core/store/store_utils.hpp index 1299118194..48a13b277c 100644 --- a/3rdParty/iresearch/core/store/store_utils.hpp +++ b/3rdParty/iresearch/core/store/store_utils.hpp @@ -419,12 +419,12 @@ class IRESEARCH_API bytes_ref_input : public index_input { return pos_ >= data_.end(); } - virtual byte_type read_byte() final { + virtual byte_type read_byte() override final { assert(pos_ < data_.end()); return *pos_++; } - virtual size_t read_bytes(byte_type* b, size_t size) final; + virtual size_t read_bytes(byte_type* b, size_t size) override final; // append to buf void read_bytes(bstring& buf, size_t size); @@ -450,23 +450,23 @@ class IRESEARCH_API bytes_ref_input : public index_input { return dup(); } - virtual int32_t read_int() final { + virtual int32_t read_int() override final { return irs::read(pos_); } - virtual int64_t read_long() final { + virtual int64_t read_long() override final { return irs::read(pos_); } - virtual uint64_t read_vlong() final { + virtual uint64_t read_vlong() override final { return irs::vread(pos_); } - virtual uint32_t read_vint() final { + virtual uint32_t read_vint() override final { return irs::vread(pos_); } - virtual int64_t checksum(size_t offset) const final; + virtual int64_t checksum(size_t offset) const override final; private: bytes_ref data_; @@ -508,29 +508,29 @@ class IRESEARCH_API bytes_input final: public data_input, public bytes_ref { return pos_ >= this->end(); } - virtual byte_type read_byte() final { + virtual byte_type read_byte() override final { assert(pos_ < this->end()); return *pos_++; } - virtual size_t read_bytes(byte_type* b, size_t size) final; + virtual size_t read_bytes(byte_type* b, size_t size) override final; // append to buf void read_bytes(bstring& buf, size_t size); - virtual int32_t read_int() final { + virtual int32_t read_int() override final { return irs::read(pos_); } - virtual int64_t read_long() final { + virtual int64_t read_long() override final { return irs::read(pos_); } - virtual uint32_t read_vint() final { + virtual uint32_t read_vint() override final { return irs::vread(pos_); } - virtual uint64_t read_vlong() final { + virtual uint64_t read_vlong() override final { return irs::vread(pos_); } @@ -835,4 +835,4 @@ NS_END // encode NS_END // ROOT -#endif \ No newline at end of file +#endif diff --git a/3rdParty/iresearch/core/utils/fst_matcher.hpp b/3rdParty/iresearch/core/utils/fst_matcher.hpp index 4ab016796f..87147f426b 100644 --- a/3rdParty/iresearch/core/utils/fst_matcher.hpp +++ b/3rdParty/iresearch/core/utils/fst_matcher.hpp @@ -59,50 +59,50 @@ class explicit_matcher final : public MatcherBase