[checkmk-commits] Make IWYU and clang-tidy happy again.

Module: check_mk Branch: master Commit: 7da6b3c46284747a7f9401dc3fc4080703c3c291 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7da6b3c4628474… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Thu Feb 2 15:52:24 2017 +0100 Make IWYU and clang-tidy happy again. Change-Id: I89d9919cf8ae94f70fcc0261d10b12fbda4ad0c3 --- livestatus/src/ContactGroupsColumn.h | 7 ++++++- livestatus/src/ContactGroupsMemberColumn.h | 1 + livestatus/src/HostListColumn.h | 1 + livestatus/src/HostListStateColumn.h | 1 + livestatus/src/ServiceListColumn.h | 1 + livestatus/src/ServiceListStateColumn.h | 1 + livestatus/src/TableComments.h | 1 + livestatus/src/TableDowntimes.h | 1 + 8 files changed, 13 insertions(+), 1 deletion(-) diff --git a/livestatus/src/ContactGroupsColumn.h b/livestatus/src/ContactGroupsColumn.h index 23e5ca8..90c4cac 100644 --- a/livestatus/src/ContactGroupsColumn.h +++ b/livestatus/src/ContactGroupsColumn.h @@ -41,7 +41,12 @@ public: : ListColumn(name, description, indirect_offset, extra_offset, extra_extra_offset) , _core(core) - , _offset(offset) {} + , _offset(offset) { +#ifdef CMC + (void)_core; + (void)_offset; +#endif + } void output(void *row, RowRenderer &r, contact *auth_user) override; std::unique_ptr<Contains> makeContains(const std::string &name) override; bool isEmpty(void *data) override; diff --git a/livestatus/src/ContactGroupsMemberColumn.h b/livestatus/src/ContactGroupsMemberColumn.h index 6a4a7c5..e09c6ce 100644 --- a/livestatus/src/ContactGroupsMemberColumn.h +++ b/livestatus/src/ContactGroupsMemberColumn.h @@ -31,6 +31,7 @@ #include "ContactsColumn.h" #ifdef CMC +#include "cmc.h" class RowRenderer; #else #include "nagios.h" diff --git a/livestatus/src/HostListColumn.h b/livestatus/src/HostListColumn.h index 139a7eb..f0895eb 100644 --- a/livestatus/src/HostListColumn.h +++ b/livestatus/src/HostListColumn.h @@ -35,6 +35,7 @@ class RowRenderer; #ifdef CMC #include <unordered_set> +#include "cmc.h" class Host; #else #include "nagios.h" diff --git a/livestatus/src/HostListStateColumn.h b/livestatus/src/HostListStateColumn.h index 8f8d50b..c738346 100644 --- a/livestatus/src/HostListStateColumn.h +++ b/livestatus/src/HostListStateColumn.h @@ -33,6 +33,7 @@ #ifdef CMC #include <unordered_set> +#include "cmc.h" class Host; #else #include "nagios.h" diff --git a/livestatus/src/ServiceListColumn.h b/livestatus/src/ServiceListColumn.h index f52bb99..bb85991 100644 --- a/livestatus/src/ServiceListColumn.h +++ b/livestatus/src/ServiceListColumn.h @@ -35,6 +35,7 @@ class RowRenderer; #ifdef CMC #include <unordered_set> +#include "cmc.h" class Service; #else #include "nagios.h" diff --git a/livestatus/src/ServiceListStateColumn.h b/livestatus/src/ServiceListStateColumn.h index 2685e67..fb5265b 100644 --- a/livestatus/src/ServiceListStateColumn.h +++ b/livestatus/src/ServiceListStateColumn.h @@ -32,6 +32,7 @@ #ifdef CMC #include <unordered_set> +#include "cmc.h" class Service; typedef std::unordered_set<Service *> servicelist_t; #else diff --git a/livestatus/src/TableComments.h b/livestatus/src/TableComments.h index b4c8b1f..a91d58a 100644 --- a/livestatus/src/TableComments.h +++ b/livestatus/src/TableComments.h @@ -33,6 +33,7 @@ class Query; #ifdef CMC #include <mutex> #include "Notes.h" +#include "cmc.h" class Core; #else #include "nagios.h" diff --git a/livestatus/src/TableDowntimes.h b/livestatus/src/TableDowntimes.h index 415ae62..517c54b 100644 --- a/livestatus/src/TableDowntimes.h +++ b/livestatus/src/TableDowntimes.h @@ -33,6 +33,7 @@ class Query; #ifdef CMC #include <mutex> #include "Notes.h" +#include "cmc.h" class Core; #else #include "nagios.h"