1
0
Fork 0

add missing override specifiers (#5262)

This commit is contained in:
Jan 2018-05-04 11:55:53 +02:00 committed by GitHub
parent 7f37314df8
commit acab8b45f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 72 additions and 72 deletions

View File

@ -184,7 +184,7 @@ class IRESEARCH_API position : public attribute {
explicit impl(size_t reserve_attrs); explicit impl(size_t reserve_attrs);
virtual void clear() = 0; virtual void clear() = 0;
const attribute_view& attributes() const NOEXCEPT { const attribute_view& attributes() const NOEXCEPT override {
return attrs_; return attrs_;
} }

View File

@ -1096,9 +1096,9 @@ class pos_doc_iterator : public doc_iterator {
const irs::attribute_view& attrs, const irs::attribute_view& attrs,
const index_input* pos_in, const index_input* pos_in,
const index_input* pay_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_); assert(pos_);
// notify positions // notify positions
pos_->prepare(ctx); pos_->prepare(ctx);
@ -3077,8 +3077,8 @@ class column_iterator final: public irs::doc_iterator {
struct payload_iterator: public irs::payload_iterator { struct payload_iterator: public irs::payload_iterator {
const irs::bytes_ref* value_{ nullptr }; const irs::bytes_ref* value_{ nullptr };
virtual bool next() { return nullptr != value_; } virtual bool next() override { return nullptr != value_; }
virtual const irs::bytes_ref& value() const { virtual const irs::bytes_ref& value() const override {
return value_ ? *value_ : irs::bytes_ref::NIL; return value_ ? *value_ : irs::bytes_ref::NIL;
} }
}; };

View File

@ -47,7 +47,7 @@ struct documents final : attribute {
struct term_meta final : irs::term_meta { struct term_meta final : irs::term_meta {
term_meta(): e_single_doc(0) {} // GCC 4.9 does not initialize unions properly term_meta(): e_single_doc(0) {} // GCC 4.9 does not initialize unions properly
void clear() { void clear() override {
irs::term_meta::clear(); irs::term_meta::clear();
doc_start = pos_start = pay_start = 0; doc_start = pos_start = pay_start = 0;
pos_end = type_limits<type_t::address_t>::invalid(); pos_end = type_limits<type_t::address_t>::invalid();

View File

@ -85,7 +85,7 @@ struct IRESEARCH_API sub_reader : index_reader {
using index_reader::docs_count; using index_reader::docs_count;
// returns number of live documents by the specified field // 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); const term_reader* rdr = this->field(field);
return nullptr == rdr ? 0 : rdr->docs_count(); return nullptr == rdr ? 0 : rdr->docs_count();
} }

View File

@ -77,28 +77,28 @@ struct empty_term_iterator : term_iterator {
}; };
struct empty_term_reader : singleton<empty_term_reader>, term_reader { struct empty_term_reader : singleton<empty_term_reader>, term_reader {
virtual iresearch::seek_term_iterator::ptr iterator() const { return nullptr; } virtual iresearch::seek_term_iterator::ptr iterator() const override { return nullptr; }
virtual const iresearch::field_meta& meta() const { virtual const iresearch::field_meta& meta() const override {
return irs::field_meta::EMPTY; 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(); return irs::attribute_view::empty_instance();
} }
// total number of terms // total number of terms
virtual size_t size() const { return 0; } virtual size_t size() const override { return 0; }
// total number of documents // total number of documents
virtual uint64_t docs_count() const { return 0; } virtual uint64_t docs_count() const override { return 0; }
// less significant term // less significant term
virtual const iresearch::bytes_ref& (min)() const { virtual const iresearch::bytes_ref& (min)() const override {
return iresearch::bytes_ref::NIL; return iresearch::bytes_ref::NIL;
} }
// most significant term // most significant term
virtual const iresearch::bytes_ref& (max)() const { virtual const iresearch::bytes_ref& (max)() const override {
return iresearch::bytes_ref::NIL; return iresearch::bytes_ref::NIL;
} }
}; // empty_term_reader }; // empty_term_reader

View File

@ -413,7 +413,7 @@ class store_columnstore_iterator final: public store_doc_iterator_base {
size_t offset_ = 0; // initially no data size_t offset_ = 0; // initially no data
irs::bytes_ref value_; irs::bytes_ref value_;
virtual bool next() { virtual bool next() override {
if (!offset_) { if (!offset_) {
value_ = irs::bytes_ref::NIL; value_ = irs::bytes_ref::NIL;
@ -433,7 +433,7 @@ class store_columnstore_iterator final: public store_doc_iterator_base {
return true; 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_; payload_iterator doc_payload_;

View File

@ -242,7 +242,7 @@ const irs::iql::query_builder::branch_builder_function_t SIMILAR_BRANCH_BUILDER
const iresearch::index_reader&, const iresearch::index_reader&,
const iresearch::order::prepared&, const iresearch::order::prepared&,
boost_t, boost_t,
const iresearch::attribute_view&) const { const iresearch::attribute_view&) const override {
iresearch::filter::prepared::ptr result; // null-ptr result iresearch::filter::prepared::ptr result; // null-ptr result
return result; return result;
} }

View File

@ -65,7 +65,7 @@ class bm25_sort : public sort {
return b_ == 0.f; return b_ == 0.f;
} }
virtual sort::prepared::ptr prepare() const; virtual sort::prepared::ptr prepare() const override;
private: private:
float_t k_; // [1.2 .. 2.0] float_t k_; // [1.2 .. 2.0]

View File

@ -68,7 +68,7 @@ class IRESEARCH_API boolean_filter : public filter, private util::noncopyable {
const order::prepared& ord, const order::prepared& ord,
boost_t boost, boost_t boost,
const attribute_view& ctx const attribute_view& ctx
) const final; ) const override final;
protected: protected:
boolean_filter(const type_id& type) NOEXCEPT; boolean_filter(const type_id& type) NOEXCEPT;

View File

@ -47,7 +47,7 @@ public:
bool normalize() const { return normalize_; } bool normalize() const { return normalize_; }
void normalize(bool value) { normalize_ = value; } void normalize(bool value) { normalize_ = value; }
virtual sort::prepared::ptr prepare() const; virtual sort::prepared::ptr prepare() const override;
private: private:
bool normalize_; bool normalize_;

View File

@ -137,29 +137,29 @@ class IRESEARCH_API buffered_index_input : public index_input {
public: public:
virtual ~buffered_index_input(); 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(); return start_ + offset();
} }
virtual bool eof() const final { virtual bool eof() const override final {
return file_pointer() >= length(); 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_; } 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: protected:
explicit buffered_index_input(size_t buf_size = 1024); explicit buffered_index_input(size_t buf_size = 1024);

View File

@ -134,17 +134,17 @@ class IRESEARCH_API buffered_index_output : public index_output, util::noncopyab
virtual size_t file_pointer() const override; 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: protected:
virtual void flush_buffer(const byte_type* b, size_t len) = 0; virtual void flush_buffer(const byte_type* b, size_t len) = 0;

View File

@ -252,7 +252,7 @@ class fs_index_output : public buffered_index_output {
class pooled_fs_index_input; // predeclaration used by fs_index_input class pooled_fs_index_input; // predeclaration used by fs_index_input
class fs_index_input : public buffered_index_input { class fs_index_input : public buffered_index_input {
public: 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 begin = handle_->pos;
const auto end = (std::min)(begin + offset, handle_->size); const auto end = (std::min)(begin + offset, handle_->size);
@ -422,8 +422,8 @@ class pooled_fs_index_input final : public fs_index_input {
public: public:
explicit pooled_fs_index_input(const fs_index_input& in); explicit pooled_fs_index_input(const fs_index_input& in);
virtual ~pooled_fs_index_input(); virtual ~pooled_fs_index_input();
virtual ptr dup() const NOEXCEPT; virtual ptr dup() const NOEXCEPT override;
virtual ptr reopen() const NOEXCEPT; virtual ptr reopen() const NOEXCEPT override;
private: private:
typedef unbounded_object_pool<file_handle> fd_pool_t; typedef unbounded_object_pool<file_handle> fd_pool_t;

View File

@ -38,7 +38,7 @@ class IRESEARCH_API mmap_directory : public fs_directory {
virtual index_input::ptr open( virtual index_input::ptr open(
const std::string& name, const std::string& name,
IOAdvice advice IOAdvice advice
) const NOEXCEPT final; ) const NOEXCEPT override final;
}; // mmap_directory }; // mmap_directory
NS_END // ROOT NS_END // ROOT

View File

@ -419,12 +419,12 @@ class IRESEARCH_API bytes_ref_input : public index_input {
return pos_ >= data_.end(); return pos_ >= data_.end();
} }
virtual byte_type read_byte() final { virtual byte_type read_byte() override final {
assert(pos_ < data_.end()); assert(pos_ < data_.end());
return *pos_++; 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 // append to buf
void read_bytes(bstring& buf, size_t size); void read_bytes(bstring& buf, size_t size);
@ -450,23 +450,23 @@ class IRESEARCH_API bytes_ref_input : public index_input {
return dup(); return dup();
} }
virtual int32_t read_int() final { virtual int32_t read_int() override final {
return irs::read<uint32_t>(pos_); return irs::read<uint32_t>(pos_);
} }
virtual int64_t read_long() final { virtual int64_t read_long() override final {
return irs::read<uint64_t>(pos_); return irs::read<uint64_t>(pos_);
} }
virtual uint64_t read_vlong() final { virtual uint64_t read_vlong() override final {
return irs::vread<uint64_t>(pos_); return irs::vread<uint64_t>(pos_);
} }
virtual uint32_t read_vint() final { virtual uint32_t read_vint() override final {
return irs::vread<uint32_t>(pos_); return irs::vread<uint32_t>(pos_);
} }
virtual int64_t checksum(size_t offset) const final; virtual int64_t checksum(size_t offset) const override final;
private: private:
bytes_ref data_; bytes_ref data_;
@ -508,29 +508,29 @@ class IRESEARCH_API bytes_input final: public data_input, public bytes_ref {
return pos_ >= this->end(); return pos_ >= this->end();
} }
virtual byte_type read_byte() final { virtual byte_type read_byte() override final {
assert(pos_ < this->end()); assert(pos_ < this->end());
return *pos_++; 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 // append to buf
void read_bytes(bstring& buf, size_t size); void read_bytes(bstring& buf, size_t size);
virtual int32_t read_int() final { virtual int32_t read_int() override final {
return irs::read<uint32_t>(pos_); return irs::read<uint32_t>(pos_);
} }
virtual int64_t read_long() final { virtual int64_t read_long() override final {
return irs::read<uint64_t>(pos_); return irs::read<uint64_t>(pos_);
} }
virtual uint32_t read_vint() final { virtual uint32_t read_vint() override final {
return irs::vread<uint32_t>(pos_); return irs::vread<uint32_t>(pos_);
} }
virtual uint64_t read_vlong() final { virtual uint64_t read_vlong() override final {
return irs::vread<uint64_t>(pos_); return irs::vread<uint64_t>(pos_);
} }

View File

@ -59,50 +59,50 @@ class explicit_matcher final : public MatcherBase<typename MatcherImpl::FST::Arc
match_type_(rhs.match_type_) { match_type_(rhs.match_type_) {
} }
explicit_matcher* Copy(bool safe = false) const { explicit_matcher* Copy(bool safe = false) const override {
return new explicit_matcher(*this, safe); return new explicit_matcher(*this, safe);
} }
MatchType Type(bool test) const { MatchType Type(bool test) const override {
return matcher_.Type(test); return matcher_.Type(test);
} }
void SetState(StateId s) { void SetState(StateId s) override {
matcher_.SetState(s); matcher_.SetState(s);
} }
bool Find(Label match_label) { bool Find(Label match_label) override {
matcher_.Find(match_label); matcher_.Find(match_label);
CheckArc(); CheckArc();
return !Done(); return !Done();
} }
bool Done() const { return matcher_.Done(); } bool Done() const override { return matcher_.Done(); }
const Arc& Value() const { return matcher_.Value(); } const Arc& Value() const override { return matcher_.Value(); }
void Next() { void Next() override {
matcher_.Next(); matcher_.Next();
CheckArc(); CheckArc();
} }
Weight Final(StateId s) const { Weight Final(StateId s) const override {
return matcher_.Final(s); return matcher_.Final(s);
} }
ssize_t Priority(StateId s) { ssize_t Priority(StateId s) override {
return matcher_.Priority(s); return matcher_.Priority(s);
} }
const FST& GetFst() const { const FST& GetFst() const override {
return matcher_.GetFst(); return matcher_.GetFst();
} }
uint64 Properties(uint64 inprops) const { uint64 Properties(uint64 inprops) const override {
return matcher_.Properties(inprops); return matcher_.Properties(inprops);
} }
uint32 Flags() const { uint32 Flags() const override {
return matcher_.Flags(); return matcher_.Flags();
} }

View File

@ -74,16 +74,16 @@ template<
end_(end) { end_(end) {
} }
const_reference value() const NOEXCEPT { const_reference value() const NOEXCEPT override {
return *cur_; return *cur_;
} }
bool seek(const key_type& key) NOEXCEPT { bool seek(const key_type& key) NOEXCEPT override {
begin_ = std::lower_bound(cur_, end_, key, comparer_t::get()); begin_ = std::lower_bound(cur_, end_, key, comparer_t::get());
return next(); return next();
} }
bool next() NOEXCEPT { bool next() NOEXCEPT override {
if (begin_ == end_) { if (begin_ == end_) {
cur_ = begin_; // seal iterator cur_ = begin_; // seal iterator
return false; return false;