[checkmk-commits] Keep order of sub-filters.

Module: check_mk Branch: master Commit: 21b3a05d0bd173e190d7313cf0a709b0dbbfc3e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21b3a05d0bd173… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Fri Mar 2 15:13:49 2018 +0100 Keep order of sub-filters. Change-Id: I970cbb136ffdc81042ffe68e212e15c302cc74ed --- livestatus/src/Query.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 289b223..2894c28 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "Query.h" +#include <algorithm> #include <cctype> #include <chrono> #include <cmath> @@ -240,6 +241,7 @@ void Query::parseAndOrLine(const std::string &header, subfilters.push_back(std::move(filters.back())); filters.pop_back(); } + std::reverse(subfilters.begin(), subfilters.end()); filters.push_back( makeFilter(header, negated_header, op, std::move(subfilters))); } @@ -272,6 +274,7 @@ void Query::parseStatsAndOrLine(const std::string &header, subfilters.push_back(_stats_columns.back()->stealFilter()); _stats_columns.pop_back(); } + std::reverse(subfilters.begin(), subfilters.end()); _stats_columns.push_back(std::make_unique<StatsColumnCount>( makeFilter(header, negated_header, op, std::move(subfilters)))); }