[checkmk-commits] Merge duplicate ServiceListColumn.h

Module: check_mk Branch: master Commit: eaa85cd9b37950bb1d15a6d0abfcfcb24dd95b24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eaa85cd9b37950… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Thu Feb 2 13:26:55 2017 +0100 Merge duplicate ServiceListColumn.h Change-Id: I692d5056fce2eeb671fd8ae5e35525a584d0bf58 --- livestatus/src/ServiceListColumn.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/livestatus/src/ServiceListColumn.h b/livestatus/src/ServiceListColumn.h index 1c80a5c..f52bb99 100644 --- a/livestatus/src/ServiceListColumn.h +++ b/livestatus/src/ServiceListColumn.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 Service; +#else +#include "nagios.h" +#endif + class ServiceListColumn : public Column { public: ServiceListColumn(const std::string &name, const std::string &description, @@ -50,7 +56,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<Service *> *getMembers(void *data); +#else servicesmember *getMembers(void *data); +#endif private: bool _hostname_required; @@ -58,7 +68,9 @@ private: bool _show_host; int _info_depth; +#ifndef CMC int inCustomTimeperiod(service *svc, const char *varname); +#endif }; #endif // ServiceListColumn_h