[checkmk-commits] Unify ContactGroupsMemberColumn implementations.

Module: check_mk Branch: master Commit: 3b1ae0196f7b4f50bef1be853866027898614efa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b1ae0196f7b4f… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Mon Nov 6 11:28:04 2017 +0100 Unify ContactGroupsMemberColumn implementations. Change-Id: I48f6b69aca4f9fe8ac2eb6df8224c504063b0bc4 --- livestatus/src/ContactGroupsMemberColumn.cc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/livestatus/src/ContactGroupsMemberColumn.cc b/livestatus/src/ContactGroupsMemberColumn.cc index b5a737b..31918f6 100644 --- a/livestatus/src/ContactGroupsMemberColumn.cc +++ b/livestatus/src/ContactGroupsMemberColumn.cc @@ -24,11 +24,22 @@ #include "ContactGroupsMemberColumn.h" #include "Row.h" + +#ifdef CMC +#include "ContactGroup.h" +#else #include "nagios.h" +#endif std::vector<std::string> ContactGroupsMemberColumn::getValue( Row row, const contact* /*auth_user*/, std::chrono::seconds /*timezone_offset*/) const { +#ifdef CMC + if (auto cg = columnData<ContactGroup>(row)) { + return cg->contactNames(); + } + return {}; +#else std::vector<std::string> names; if (auto cg = columnData<contactgroup>(row)) { for (auto cm = cg->members; cm != nullptr; cm = cm->next) { @@ -36,4 +47,5 @@ std::vector<std::string> ContactGroupsMemberColumn::getValue( } } return names; +#endif }