[checkmk-commits] Revert "IWYU fixes."

Module: check_mk Branch: master Commit: 013119907d5304c56d252b2351078678149ce2e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=013119907d5304… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Fri Mar 29 16:05:29 2019 +0100 Revert "IWYU fixes." This reverts commit 42ba137b06e597fa195296fce0ef1066552dcac2. --- livestatus/src/CustomVarsDictColumn.cc | 1 + livestatus/src/CustomVarsDictColumn.h | 1 - livestatus/src/CustomVarsDictFilter.h | 1 - livestatus/src/TableStateHistory.cc | 2 +- 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/livestatus/src/CustomVarsDictColumn.cc b/livestatus/src/CustomVarsDictColumn.cc index 86fa8fe..07d4e3f 100644 --- a/livestatus/src/CustomVarsDictColumn.cc +++ b/livestatus/src/CustomVarsDictColumn.cc @@ -32,6 +32,7 @@ class Aggregator; #ifdef CMC +#include "Entity.h" #include "cmc.h" #else #include "nagios.h" diff --git a/livestatus/src/CustomVarsDictColumn.h b/livestatus/src/CustomVarsDictColumn.h index 8b63cda..13e852e 100644 --- a/livestatus/src/CustomVarsDictColumn.h +++ b/livestatus/src/CustomVarsDictColumn.h @@ -39,7 +39,6 @@ class Row; class RowRenderer; #ifndef CMC -#include "contact_fwd.h" // TODO(sp) Why on earth is "contact_fwd.h" not enough??? #include "nagios.h" #endif diff --git a/livestatus/src/CustomVarsDictFilter.h b/livestatus/src/CustomVarsDictFilter.h index 8f24045..df7ea03 100644 --- a/livestatus/src/CustomVarsDictFilter.h +++ b/livestatus/src/CustomVarsDictFilter.h @@ -37,7 +37,6 @@ class RegExp; class Row; #ifndef CMC -#include "contact_fwd.h" // TODO(sp) Why on earth is "contact_fwd.h" not enough??? #include "nagios.h" #endif diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index ee6ab07..6a8572f 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -31,6 +31,7 @@ #include <ostream> #include <set> #include <stdexcept> +#include <unordered_map> #include <utility> #include <vector> #include "Column.h" @@ -63,7 +64,6 @@ #define STATE_CRITICAL 2 #define STATE_UNKNOWN 3 #else -#include <unordered_map> #include "auth.h" #include "nagios.h" #endif