[checkmk-commits] Merge duplicate TableComments.h

Module: check_mk Branch: master Commit: b503f300c7acf5831c413a74b6c9d113f90d818c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b503f300c7acf5… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Thu Feb 2 14:39:51 2017 +0100 Merge duplicate TableComments.h Change-Id: I32dd2c903631bbecaacce13ac7e8af10c8d46887 --- livestatus/src/TableComments.h | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/livestatus/src/TableComments.h b/livestatus/src/TableComments.h index 3a5f5bb..b4c8b1f 100644 --- a/livestatus/src/TableComments.h +++ b/livestatus/src/TableComments.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 TableComments : public Table { public: +#ifdef CMC + TableComments(const Downtimes &downtimes_holder, + const Comments &comments_holder, + std::recursive_mutex &holder_lock, Core *core); +#else TableComments(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 Comments &_holder; + std::recursive_mutex &_holder_lock; +#else const DowntimesOrComments &_holder; +#endif }; #endif // TableComments_h