[checkmk-commits] Merge duplicate ContactGroupsMemberColumn.h

Module: check_mk Branch: master Commit: 493811d0b45ee943bd8800d88278a3b5dccb3026 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=493811d0b45ee9… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Thu Feb 2 12:39:50 2017 +0100 Merge duplicate ContactGroupsMemberColumn.h Change-Id: I2b251920af9bbb2bba08106206e66059bc41e35e --- livestatus/src/ContactGroupsMemberColumn.h | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/livestatus/src/ContactGroupsMemberColumn.h b/livestatus/src/ContactGroupsMemberColumn.h index bc9d0f4..6a4a7c5 100644 --- a/livestatus/src/ContactGroupsMemberColumn.h +++ b/livestatus/src/ContactGroupsMemberColumn.h @@ -29,18 +29,28 @@ #include <memory> #include <string> #include "ContactsColumn.h" + +#ifdef CMC +class RowRenderer; +#else #include "nagios.h" +#endif class ContactGroupsMemberColumn : public ContactsColumn { public: - ContactGroupsMemberColumn(const std::string& name, - const std::string& description, + ContactGroupsMemberColumn(const std::string &name, + const std::string &description, int indirect_offset, int extra_offset, int extra_extra_offset) : ContactsColumn(name, description, indirect_offset, extra_offset, extra_extra_offset) {} - std::unique_ptr<Contains> makeContains(const std::string& name) override; - std::unique_ptr<Contains> containsContact(contact* ctc) override; + std::unique_ptr<Contains> makeContains(const std::string &name) override; +#ifdef CMC + void output(void *row, RowRenderer &r, contact *auth_user) override; + bool isEmpty(void *data) override; +#else + std::unique_ptr<Contains> containsContact(contact *ctc) override; +#endif }; #endif // ContactGroupsMemberColumn_h