[checkmk-commits] Services are owned by their corresponding Host.

Module: check_mk Branch: master Commit: 84e98aceb04ef5e6fce7e9ffc1019c03f6804402 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84e98aceb04ef5… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Fri Aug 4 14:30:53 2017 +0200 Services are owned by their corresponding Host. Change-Id: I6bdbd3d1fdcbf96ff793b98280b2ce8c77511e46 --- livestatus/src/ServiceListColumn.h | 5 ++--- livestatus/src/ServiceListStateColumn.h | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/livestatus/src/ServiceListColumn.h b/livestatus/src/ServiceListColumn.h index f5796f3..8edaad2 100644 --- a/livestatus/src/ServiceListColumn.h +++ b/livestatus/src/ServiceListColumn.h @@ -37,8 +37,7 @@ class Row; class RowRenderer; #ifdef CMC -#include <unordered_set> -class Service; +#include "Host.h" #else #include "nagios.h" #endif @@ -62,7 +61,7 @@ public: std::unique_ptr<Filter> createFilter(RelationalOperator relOp, const std::string &value) override; #ifdef CMC - std::unordered_set<Service *> *getMembers(Row row); + Host::services_t *getMembers(Row row); #else servicesmember *getMembers(Row row); #endif diff --git a/livestatus/src/ServiceListStateColumn.h b/livestatus/src/ServiceListStateColumn.h index 3c52742..d960850 100644 --- a/livestatus/src/ServiceListStateColumn.h +++ b/livestatus/src/ServiceListStateColumn.h @@ -34,9 +34,7 @@ class MonitoringCore; class Row; #ifdef CMC -#include <unordered_set> -class Service; -typedef std::unordered_set<Service *> servicelist_t; +#include "Host.h" #else #include "nagios.h" #endif @@ -71,7 +69,7 @@ public: int32_t getValue(Row row, contact *auth_user) override; #ifdef CMC static int32_t getValue(MonitoringCore *mc, Type logictype, - servicelist_t *mem, contact *auth_user); + Host::services_t *mem, contact *auth_user); #else static int32_t getValue(MonitoringCore *mc, Type logictype, servicesmember *mem, contact *auth_user);