[checkmk-commits] Merge duplicate HostListStateColumn.h

Module: check_mk Branch: master Commit: 7d612c5f72234ae3d8639c4ba838bc16ba99e982 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d612c5f72234a… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Thu Feb 2 13:21:25 2017 +0100 Merge duplicate HostListStateColumn.h Change-Id: I187490597ddbdbc1fca3f7d1578433912a9c174e --- livestatus/src/HostListStateColumn.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/livestatus/src/HostListStateColumn.h b/livestatus/src/HostListStateColumn.h index b6eb797..8f8d50b 100644 --- a/livestatus/src/HostListStateColumn.h +++ b/livestatus/src/HostListStateColumn.h @@ -30,7 +30,13 @@ #include <string> #include "IntColumn.h" #include "ServiceListStateColumn.h" + +#ifdef CMC +#include <unordered_set> +class Host; +#else #include "nagios.h" +#endif class HostListStateColumn : public IntColumn { public: @@ -72,10 +78,14 @@ public: , _offset(offset) , _logictype(logictype) {} int32_t getValue(void *row, contact *auth_user) override; +#ifdef CMC + std::unordered_set<Host *> *getMembers(void *data); +#else hostsmember *getMembers(void *data); +#endif private: - int _offset; + const int _offset; const Type _logictype; };