[checkmk-commits] Some IWYU fixes.

Module: check_mk Branch: master Commit: b9d696f4d847e35b2c4cba982a2fcada39117456 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9d696f4d847e3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jan 15 08:25:45 2016 +0100 Some IWYU fixes. --- livestatus/src/ContactgroupsMemberColumn.h | 2 +- livestatus/src/HostContactsColumn.h | 2 +- livestatus/src/ServiceContactsColumn.h | 2 +- livestatus/src/TableDownComm.cc | 1 - livestatus/src/TableHosts.cc | 1 - livestatus/src/TableLog.cc | 1 - livestatus/src/TableServices.cc | 1 - livestatus/src/TableStateHistory.cc | 1 - 8 files changed, 3 insertions(+), 8 deletions(-) diff --git a/livestatus/src/ContactgroupsMemberColumn.h b/livestatus/src/ContactgroupsMemberColumn.h index cd6a76a..65c9ab9 100644 --- a/livestatus/src/ContactgroupsMemberColumn.h +++ b/livestatus/src/ContactgroupsMemberColumn.h @@ -37,7 +37,7 @@ public: ContactgroupsMemberColumn(std::string name, std::string description, int indirect_offset, int extra_offset = -1) : ContactsColumn(name, description, indirect_offset, extra_offset) {} int type() override { return COLTYPE_LIST; } - bool isNagiosMember(void *data, void *member); + bool isNagiosMember(void *data, void *member) override; }; #endif // ContactgroupsMemberColumn_h diff --git a/livestatus/src/HostContactsColumn.h b/livestatus/src/HostContactsColumn.h index 9cd9dff..ccdbdf5 100644 --- a/livestatus/src/HostContactsColumn.h +++ b/livestatus/src/HostContactsColumn.h @@ -37,7 +37,7 @@ public: HostContactsColumn(std::string name, std::string description, int indirect_offset, int extra_offset = -1) : ContactsColumn(name, description, indirect_offset, extra_offset = -1) {} int type() override { return COLTYPE_LIST; } - bool isNagiosMember(void *data, void *member); + bool isNagiosMember(void *data, void *member) override; }; #endif // HostContactsColumn_h diff --git a/livestatus/src/ServiceContactsColumn.h b/livestatus/src/ServiceContactsColumn.h index 30fb8c2..dd9c270 100644 --- a/livestatus/src/ServiceContactsColumn.h +++ b/livestatus/src/ServiceContactsColumn.h @@ -37,7 +37,7 @@ public: ServiceContactsColumn(std::string name, std::string description, int indirect_offset, int extra_offset = -1) : ContactsColumn(name, description, indirect_offset, extra_offset) {} int type() override { return COLTYPE_LIST; } - bool isNagiosMember(void *data, void *member); + bool isNagiosMember(void *data, void *member) override; }; #endif // ServiceContactsColumn_h diff --git a/livestatus/src/TableDownComm.cc b/livestatus/src/TableDownComm.cc index d08f4d4..f4ecb7c 100644 --- a/livestatus/src/TableDownComm.cc +++ b/livestatus/src/TableDownComm.cc @@ -32,7 +32,6 @@ #include "TableServices.h" #include "auth.h" #include "logger.h" -#include "tables.h" using std::make_pair; diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index e4856d2..5c40dbf 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -48,7 +48,6 @@ #include "ServicelistStateColumn.h" #include "TableHostgroups.h" #include "auth.h" -#include "tables.h" using std::string; diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index 2914ebe..8c219c8 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -40,7 +40,6 @@ #include "TableContacts.h" #include "TableHosts.h" #include "TableServices.h" -#include "tables.h" #ifndef CMC #include "auth.h" diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index 7956182..25a4daf 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -48,7 +48,6 @@ #include "TableServicegroups.h" #include "auth.h" #include "strutil.h" -#include "tables.h" using std::string; diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index f0cdf9e..cf72fe2 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -47,7 +47,6 @@ #include "TableHosts.h" #include "TableServices.h" #include "logger.h" -#include "tables.h" #ifdef CMC #include "Host.h"