[checkmk-commits] Reordered methods according to super class.

Module: check_mk Branch: master Commit: 403cbca94ff2d41219c035c0eb709d4bec6f281f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=403cbca94ff2d4… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Mon Dec 4 13:23:23 2017 +0100 Reordered methods according to super class. Change-Id: I930d21b625d0e2bda3448781949831c87d29ade0 --- livestatus/src/AndingFilter.cc | 20 ++++++++++---------- livestatus/src/AndingFilter.h | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/livestatus/src/AndingFilter.cc b/livestatus/src/AndingFilter.cc index 6a1a515..30c8e54 100644 --- a/livestatus/src/AndingFilter.cc +++ b/livestatus/src/AndingFilter.cc @@ -42,6 +42,16 @@ bool AndingFilter::accepts(Row row, const contact *auth_user, return true; } +const std::string *AndingFilter::stringValueRestrictionFor( + const std::string &column_name) const { + for (const auto &filter : _subfilters) { + if (auto value = filter->stringValueRestrictionFor(column_name)) { + return value; + } + } + return nullptr; +} + void AndingFilter::findIntLimits(const std::string &colum_nname, int *lower, int *upper, std::chrono::seconds timezone_offset) const { @@ -77,13 +87,3 @@ std::unique_ptr<Filter> AndingFilter::negate() const { [](const auto &filter) { return filter->negate(); }); return std::make_unique<OringFilter>(std::move(filters)); } - -const std::string *AndingFilter::stringValueRestrictionFor( - const std::string &column_name) const { - for (const auto &filter : _subfilters) { - if (auto value = filter->stringValueRestrictionFor(column_name)) { - return value; - } - } - return nullptr; -} diff --git a/livestatus/src/AndingFilter.h b/livestatus/src/AndingFilter.h index f75d299..dd229d4 100644 --- a/livestatus/src/AndingFilter.h +++ b/livestatus/src/AndingFilter.h @@ -44,14 +44,14 @@ public: void accept(FilterVisitor &v) const override; bool accepts(Row row, const contact *auth_user, std::chrono::seconds timezone_offset) const override; + const std::string *stringValueRestrictionFor( + const std::string &column_name) const override; void findIntLimits(const std::string &colum_nname, int *lower, int *upper, std::chrono::seconds timezone_offset) const override; bool optimizeBitmask(const std::string &column_name, uint32_t *mask, std::chrono::seconds timezone_offset) const override; std::unique_ptr<Filter> copy() const override; std::unique_ptr<Filter> negate() const override; - const std::string *stringValueRestrictionFor( - const std::string &column_name) const override; auto begin() const { return _subfilters.begin(); } auto end() const { return _subfilters.end(); }