mirrors/turtle
3
0
Fork 0
mirror of https://github.com/mat007/turtle.git synced 2026-08-20 21:09:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use override instead of virtual

Browse source
This commit is contained in:
Alexander Grund 2026-07-05 12:23:22 +02:00
parent cb9e7e226b
commit 1c168d57fb
No known key found for this signature in database
GPG key ID: AA48A0760367A42B
8 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/example/limitations_const_parameter_warning.cpp
View file

@ -24,7 +24,7 @@ namespace limitations_const_parameter_warning_explanation {
class derived : public base class derived : public base
{ {
public: public:
virtual void method(const int); void method(const int) override;
}; };
void derived::method(int) {} void derived::method(int) {}
@ -35,7 +35,7 @@ namespace {
//[ limitations_const_parameter_warning_solution //[ limitations_const_parameter_warning_solution
MOCK_BASE_CLASS(mock_base, base) MOCK_BASE_CLASS(mock_base, base)
{ {
void method(const int i) { method_stub(i); } void method(const int i) override { method_stub(i); }
MOCK_METHOD(method_stub, 1, void(int), method) MOCK_METHOD(method_stub, 1, void(int), method)
}; };
//] //]

2
doc/example/motivation.cpp
View file

@ -40,7 +40,7 @@ class my_view : public view
{ {
public: public:
my_view() : called(false) {} my_view() : called(false) {}
virtual void display(int result) void display(int result) override
{ {
called = true; called = true;
value = result; value = result;

4
include/turtle/detail/function_impl.hpp
View file

@ -102,7 +102,7 @@ namespace mock { namespace detail {
context_->remove(*this); context_->remove(*this);
} }
virtual bool verify() const bool verify() const override
{ {
lock _(mutex_); lock _(mutex_);
for(const auto& expectation : expectations_) for(const auto& expectation : expectations_)
@ -120,7 +120,7 @@ namespace mock { namespace detail {
return valid_; return valid_;
} }
virtual void reset() void reset() override
{ {
lock _(mutex_); lock _(mutex_);
valid_ = true; valid_ = true;

20
include/turtle/detail/invocation.hpp
View file

@ -44,7 +44,7 @@ namespace mock { namespace detail {
throw std::invalid_argument("'min' > 'max'"); throw std::invalid_argument("'min' > 'max'");
} }
virtual bool invoke() bool invoke() override
{ {
if(count_ == max_) if(count_ == max_)
return false; return false;
@ -52,16 +52,16 @@ namespace mock { namespace detail {
return true; return true;
} }
virtual bool exhausted() const { return count_ >= max_; } bool exhausted() const override { return count_ >= max_; }
virtual bool verify() const { return min_ <= count_ && count_ <= max_; } bool verify() const override { return min_ <= count_ && count_ <= max_; }
protected: protected:
const std::size_t min_, max_; const std::size_t min_, max_;
std::size_t count_; std::size_t count_;
private: private:
virtual std::ostream& serialize(std::ostream& s) const std::ostream& serialize(std::ostream& s) const override
{ {
return s << "between( " << count_ << "/[" << min_ << ',' << max_ << "] )"; return s << "between( " << count_ << "/[" << min_ << ',' << max_ << "] )";
} }
@ -73,7 +73,7 @@ namespace mock { namespace detail {
explicit exactly(std::size_t count) : between(count, count) {} explicit exactly(std::size_t count) : between(count, count) {}
private: private:
virtual std::ostream& serialize(std::ostream& s) const std::ostream& serialize(std::ostream& s) const override
{ {
return s << "exactly( " << count_ << '/' << max_ << " )"; return s << "exactly( " << count_ << '/' << max_ << " )";
} }
@ -85,7 +85,7 @@ namespace mock { namespace detail {
never() : exactly(0) {} never() : exactly(0) {}
private: private:
virtual std::ostream& serialize(std::ostream& s) const { return s << "never()"; } std::ostream& serialize(std::ostream& s) const override { return s << "never()"; }
}; };
class once : public exactly class once : public exactly
@ -94,7 +94,7 @@ namespace mock { namespace detail {
once() : exactly(1) {} once() : exactly(1) {}
private: private:
virtual std::ostream& serialize(std::ostream& s) const { return s << "once()"; } std::ostream& serialize(std::ostream& s) const override { return s << "once()"; }
}; };
class at_least : public between class at_least : public between
@ -103,7 +103,7 @@ namespace mock { namespace detail {
explicit at_least(std::size_t min) : between(min, (std::numeric_limits<std::size_t>::max)()) {} explicit at_least(std::size_t min) : between(min, (std::numeric_limits<std::size_t>::max)()) {}
private: private:
virtual std::ostream& serialize(std::ostream& s) const std::ostream& serialize(std::ostream& s) const override
{ {
return s << "at_least( " << count_ << '/' << min_ << " )"; return s << "at_least( " << count_ << '/' << min_ << " )";
} }
@ -115,7 +115,7 @@ namespace mock { namespace detail {
explicit at_most(std::size_t max) : between(0, max) {} explicit at_most(std::size_t max) : between(0, max) {}
private: private:
virtual std::ostream& serialize(std::ostream& s) const std::ostream& serialize(std::ostream& s) const override
{ {
return s << "at_most( " << count_ << '/' << max_ << " )"; return s << "at_most( " << count_ << '/' << max_ << " )";
} }
@ -127,7 +127,7 @@ namespace mock { namespace detail {
unlimited() : at_least(0) {} unlimited() : at_least(0) {}
private: private:
virtual std::ostream& serialize(std::ostream& s) const { return s << "unlimited()"; } std::ostream& serialize(std::ostream& s) const override { return s << "unlimited()"; }
}; };
}} // namespace mock::detail }} // namespace mock::detail

20
include/turtle/detail/object_impl.hpp
View file

@ -25,23 +25,23 @@ namespace mock { namespace detail {
public: public:
object_impl() : mutex_(std::make_shared<mutex>()) {} object_impl() : mutex_(std::make_shared<mutex>()) {}
virtual void add(const void* /*p*/, void add(const void* /*p*/,
verifiable& v, verifiable& v,
boost::unit_test::const_string instance, boost::unit_test::const_string instance,
boost::optional<type_name> type, boost::optional<type_name> type,
boost::unit_test::const_string name) boost::unit_test::const_string name) override
{ {
lock _(mutex_); lock _(mutex_);
if(children_.empty()) if(children_.empty())
detail::root.add(*this); detail::root.add(*this);
children_[&v].update(parent_, instance, type, name); children_[&v].update(parent_, instance, type, name);
} }
virtual void add(verifiable& v) void add(verifiable& v) override
{ {
lock _(mutex_); lock _(mutex_);
group_.add(v); group_.add(v);
} }
virtual void remove(verifiable& v) void remove(verifiable& v) override
{ {
lock _(mutex_); lock _(mutex_);
group_.remove(v); group_.remove(v);
@ -50,7 +50,7 @@ namespace mock { namespace detail {
detail::root.remove(*this); detail::root.remove(*this);
} }
virtual void serialize(std::ostream& s, const verifiable& v) const void serialize(std::ostream& s, const verifiable& v) const override
{ {
lock _(mutex_); lock _(mutex_);
const auto it = children_.find(&v); const auto it = children_.find(&v);
@ -60,12 +60,12 @@ namespace mock { namespace detail {
s << "?"; s << "?";
} }
virtual bool verify() const bool verify() const override
{ {
lock _(mutex_); lock _(mutex_);
return group_.verify(); return group_.verify();
} }
virtual void reset() void reset() override
{ {
lock _(mutex_); lock _(mutex_);
std::shared_ptr<object_impl> guard = shared_from_this(); std::shared_ptr<object_impl> guard = shared_from_this();

16
include/turtle/detail/root.hpp
View file

@ -24,11 +24,11 @@ namespace mock { namespace detail {
class root_t : public singleton<root_t>, public context class root_t : public singleton<root_t>, public context
{ {
public: public:
virtual void add(const void* p, void add(const void* p,
verifiable& v, verifiable& v,
boost::unit_test::const_string instance, boost::unit_test::const_string instance,
boost::optional<type_name> type, boost::optional<type_name> type,
boost::unit_test::const_string name) boost::unit_test::const_string name) override
{ {
scoped_lock _(mutex_); scoped_lock _(mutex_);
auto it = children_.lower_bound(&v); auto it = children_.lower_bound(&v);
@ -36,13 +36,13 @@ namespace mock { namespace detail {
it = children_.insert(it, std::make_pair(&v, counter_child(parents_, p))); it = children_.insert(it, std::make_pair(&v, counter_child(parents_, p)));
it->second.update(instance, type, name); it->second.update(instance, type, name);
} }
virtual void add(verifiable& v) void add(verifiable& v) override
{ {
scoped_lock _(mutex_); scoped_lock _(mutex_);
group_.add(v); group_.add(v);
} }
virtual void remove(verifiable& v) void remove(verifiable& v) override
{ {
scoped_lock _(mutex_); scoped_lock _(mutex_);
group_.remove(v); group_.remove(v);
@ -60,7 +60,7 @@ namespace mock { namespace detail {
group_.reset(); group_.reset();
} }
virtual void serialize(std::ostream& s, const verifiable& v) const void serialize(std::ostream& s, const verifiable& v) const override
{ {
scoped_lock _(mutex_); scoped_lock _(mutex_);
const auto it = children_.find(&v); const auto it = children_.find(&v);

2
include/turtle/stream.hpp
View file

@ -46,7 +46,7 @@ namespace detail { namespace conversion {
struct holder_imp : holder struct holder_imp : holder
{ {
explicit holder_imp(const T& t) : t_(t) {} explicit holder_imp(const T& t) : t_(t) {}
virtual void serialize(std::ostream& s) const void serialize(std::ostream& s) const override
{ {
// if an error about an ambiguous conversion is generated by the // if an error about an ambiguous conversion is generated by the
// line below the solution is to add a serialization operator to a // line below the solution is to add a serialization operator to a

4
test/detail/test_function.cpp
View file

@ -392,7 +392,7 @@ private:
}; };
class my_implementation : public my_interface class my_implementation : public my_interface
{ {
virtual void my_method() {} virtual void my_method() override {}
}; };
} // namespace } // namespace
@ -591,7 +591,7 @@ struct base
}; };
struct derived : base struct derived : base
{ {
virtual void f() {} virtual void f() override {}
}; };
} // namespace } // namespace