[checkmk-commits] Merge duplicate ServiceListStateColumn.h

Module: check_mk Branch: master Commit: 0b74ee22347fcaf1eb9842ae6edb196d368cea50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b74ee22347fca… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Thu Feb 2 13:37:40 2017 +0100 Merge duplicate ServiceListStateColumn.h Change-Id: I2acd96bca8e1ed5a8f6550c60128a1d066d4f575 --- livestatus/src/ServiceListStateColumn.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/livestatus/src/ServiceListStateColumn.h b/livestatus/src/ServiceListStateColumn.h index b8cf3ca..2685e67 100644 --- a/livestatus/src/ServiceListStateColumn.h +++ b/livestatus/src/ServiceListStateColumn.h @@ -29,7 +29,14 @@ #include <cstdint> #include <string> #include "IntColumn.h" + +#ifdef CMC +#include <unordered_set> +class Service; +typedef std::unordered_set<Service *> servicelist_t; +#else #include "nagios.h" +#endif class ServiceListStateColumn : public IntColumn { public: @@ -58,13 +65,18 @@ public: , _offset(offset) , _logictype(logictype) {} int32_t getValue(void *row, contact *auth_user) override; - servicesmember *getMembers(void *data); +#ifdef CMC + static int32_t getValue(Type logictype, servicelist_t *mem, + contact *auth_user); +#else static int32_t getValue(Type logictype, servicesmember *mem, contact *auth_user); + servicesmember *getMembers(void *data); +#endif static bool svcStateIsWorse(int32_t state1, int32_t state2); private: - int _offset; + const int _offset; const Type _logictype; };