[checkmk-commits] Merge duplicate TableDowntimes.h

Module: check_mk Branch: master Commit: 2b99c6bb22da159e671d5a939c9ac1639f891f20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b99c6bb22da15… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Thu Feb 2 14:47:32 2017 +0100 Merge duplicate TableDowntimes.h Change-Id: I5d5354a2cb2f6750ec651ec43a61de3121a6ae18 --- livestatus/src/TableDowntimes.h | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/livestatus/src/TableDowntimes.h b/livestatus/src/TableDowntimes.h index e768cd5..415ae62 100644 --- a/livestatus/src/TableDowntimes.h +++ b/livestatus/src/TableDowntimes.h @@ -28,16 +28,29 @@ #include "config.h" // IWYU pragma: keep #include <string> #include "Table.h" +class Query; + +#ifdef CMC +#include <mutex> +#include "Notes.h" +class Core; +#else #include "nagios.h" class DowntimesOrComments; class MonitoringCore; -class Query; +#endif class TableDowntimes : public Table { public: +#ifdef CMC + TableDowntimes(const Downtimes &downtimes_holder, + const Comments &comments_holder, + std::recursive_mutex &holder_lock, Core *core); +#else TableDowntimes(const DowntimesOrComments &downtimes_holder, const DowntimesOrComments &comments_holder, MonitoringCore *core); +#endif std::string name() const override; std::string namePrefix() const override; @@ -45,7 +58,12 @@ public: bool isAuthorized(contact *ctc, void *data) override; private: +#ifdef CMC + const Downtimes &_holder; + std::recursive_mutex &_holder_lock; +#else const DowntimesOrComments &_holder; +#endif }; #endif // TableDowntimes_h