[checkmk-commits] Merge duplicate HostListColumn.h

Module: check_mk Branch: master Commit: dadd4e421b7f811be7049ded09d7b143bd3156c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dadd4e421b7f81… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Thu Feb 2 13:02:17 2017 +0100 Merge duplicate HostListColumn.h Change-Id: I040a8d2b57bad0ba74aa0d2275a9b06704ae43c5 --- livestatus/src/HostListColumn.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/livestatus/src/HostListColumn.h b/livestatus/src/HostListColumn.h index 3129116..139a7eb 100644 --- a/livestatus/src/HostListColumn.h +++ b/livestatus/src/HostListColumn.h @@ -29,11 +29,17 @@ #include <memory> #include <string> #include "Column.h" -#include "nagios.h" #include "opids.h" class Filter; class RowRenderer; +#ifdef CMC +#include <unordered_set> +class Host; +#else +#include "nagios.h" +#endif + class HostListColumn : public Column { public: HostListColumn(const std::string &name, const std::string &description, @@ -47,7 +53,11 @@ public: void output(void *row, RowRenderer &r, contact *auth_user) override; std::unique_ptr<Filter> createFilter(RelationalOperator relOp, const std::string &value) override; +#ifdef CMC + std::unordered_set<Host *> *getMembers(void *data); +#else hostsmember *getMembers(void *data); +#endif private: const int _offset;