Module: check_mk
Branch: master
Commit: 624d56bc6f240e182b48c549cf80f18f9ac70ef6
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=624d56bc6f240e…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Thu Feb 2 12:53:03 2017 +0100
Merge duplicate ContacsColumn.h
Change-Id: I014ee3af0c45fbcd91fa2f38fb67411759835caf
---
livestatus/src/ContactsColumn.h | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/livestatus/src/ContactsColumn.h b/livestatus/src/ContactsColumn.h
index e25f4cc..4db5929 100644
--- a/livestatus/src/ContactsColumn.h
+++ b/livestatus/src/ContactsColumn.h
@@ -29,9 +29,14 @@
#include <memory>
#include <string>
#include "ListColumn.h"
-#include "nagios.h"
class RowRenderer;
+#ifdef CMC
+#include "cmc.h"
+#else
+#include "nagios.h"
+#endif
+
class ContactsColumn : public ListColumn {
public:
ContactsColumn(const std::string &name, const std::string &description,
@@ -39,7 +44,11 @@ public:
int extra_extra_offset)
: ListColumn(name, description, indirect_offset, extra_offset,
extra_extra_offset) {}
+#ifdef CMC
+ std::unique_ptr<Contains> makeContains(const std::string &name) override;
+#else
virtual std::unique_ptr<Contains> containsContact(contact *ctc) = 0;
+#endif
bool isEmpty(void *data) override;
void output(void *row, RowRenderer &r, contact *auth_user) override;
};