[checkmk-commits] More IWYU fixes.

Module: check_mk Branch: master Commit: c1872183d938c750fa4c574f9363154df99f22c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1872183d938c7… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Tue May 8 08:52:04 2018 +0200 More IWYU fixes. Change-Id: I9d6e88ae9ef015908fd08010a7af485ff9a732c5 --- livestatus/src/AndingFilter.cc | 1 + livestatus/src/AndingFilter.h | 2 +- livestatus/src/ColumnFilter.h | 2 +- livestatus/src/OringFilter.cc | 1 + livestatus/src/OringFilter.h | 2 +- livestatus/src/RegExp.cc | 3 +++ livestatus/src/ServiceGroupMembersColumn.cc | 1 + livestatus/src/ServiceListColumn.cc | 1 + livestatus/src/StatsColumn.cc | 2 +- livestatus/src/TableColumns.cc | 1 + livestatus/src/TableCommands.cc | 1 + livestatus/src/TableComments.cc | 1 + livestatus/src/TableDowntimes.cc | 1 + livestatus/src/module.cc | 1 + 14 files changed, 16 insertions(+), 4 deletions(-) diff --git a/livestatus/src/AndingFilter.cc b/livestatus/src/AndingFilter.cc index 2b7726b..ff1e988 100644 --- a/livestatus/src/AndingFilter.cc +++ b/livestatus/src/AndingFilter.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "AndingFilter.h" +#include <algorithm> #include <iterator> #include <memory> #include <ostream> diff --git a/livestatus/src/AndingFilter.h b/livestatus/src/AndingFilter.h index 6bc1cc1..426dcac 100644 --- a/livestatus/src/AndingFilter.h +++ b/livestatus/src/AndingFilter.h @@ -26,7 +26,6 @@ #define AndingFilter_h #include "config.h" // IWYU pragma: keep -#include <algorithm> #include <bitset> #include <chrono> #include <cstdint> @@ -35,6 +34,7 @@ #include <memory> #include <optional> #include <string> +#include <utility> #include "Filter.h" #include "contact_fwd.h" class Column; diff --git a/livestatus/src/ColumnFilter.h b/livestatus/src/ColumnFilter.h index fb6bf8f..b6871ae 100644 --- a/livestatus/src/ColumnFilter.h +++ b/livestatus/src/ColumnFilter.h @@ -26,11 +26,11 @@ #define ColumnFilter_h #include "config.h" // IWYU pragma: keep -#include <algorithm> #include <functional> #include <memory> #include <ostream> #include <string> +#include <utility> #include "Column.h" #include "Filter.h" #include "opids.h" diff --git a/livestatus/src/OringFilter.cc b/livestatus/src/OringFilter.cc index 492a48d..5d5eb00 100644 --- a/livestatus/src/OringFilter.cc +++ b/livestatus/src/OringFilter.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "OringFilter.h" +#include <algorithm> #include <iterator> #include <memory> #include <ostream> diff --git a/livestatus/src/OringFilter.h b/livestatus/src/OringFilter.h index 35ae845..3987dc2 100644 --- a/livestatus/src/OringFilter.h +++ b/livestatus/src/OringFilter.h @@ -26,7 +26,6 @@ #define OringFilter_h #include "config.h" // IWYU pragma: keep -#include <algorithm> #include <bitset> #include <chrono> #include <cstdint> @@ -35,6 +34,7 @@ #include <memory> #include <optional> #include <string> +#include <utility> #include "Filter.h" #include "contact_fwd.h" class Column; diff --git a/livestatus/src/RegExp.cc b/livestatus/src/RegExp.cc index 3d6be85..71840d7 100644 --- a/livestatus/src/RegExp.cc +++ b/livestatus/src/RegExp.cc @@ -68,7 +68,10 @@ private: // ----------------------------------------------------------------------------- // standard <regex> implementation // ----------------------------------------------------------------------------- +#include <map> #include <regex> +#include <sstream> +#include <vector> class RegExp::Impl { public: Impl(const std::string &str, Case c, Syntax s) diff --git a/livestatus/src/ServiceGroupMembersColumn.cc b/livestatus/src/ServiceGroupMembersColumn.cc index 8e1e47a..e91e230 100644 --- a/livestatus/src/ServiceGroupMembersColumn.cc +++ b/livestatus/src/ServiceGroupMembersColumn.cc @@ -33,6 +33,7 @@ #include "Row.h" #ifdef CMC +#include <unordered_set> #include "Host.h" #include "LogEntry.h" #include "Service.h" diff --git a/livestatus/src/ServiceListColumn.cc b/livestatus/src/ServiceListColumn.cc index 11a680c..d4d9ae8 100644 --- a/livestatus/src/ServiceListColumn.cc +++ b/livestatus/src/ServiceListColumn.cc @@ -31,6 +31,7 @@ #ifdef CMC #include <cstdint> #include <memory> +#include <unordered_set> #include "Host.h" #include "LogEntry.h" #include "Service.h" diff --git a/livestatus/src/StatsColumn.cc b/livestatus/src/StatsColumn.cc index 669c765..71766e3 100644 --- a/livestatus/src/StatsColumn.cc +++ b/livestatus/src/StatsColumn.cc @@ -23,9 +23,9 @@ // Boston, MA 02110-1301 USA. #include "StatsColumn.h" -#include <algorithm> #include <ostream> #include <stdexcept> +#include <utility> #include "Aggregator.h" #include "AndingFilter.h" #include "Column.h" diff --git a/livestatus/src/TableColumns.cc b/livestatus/src/TableColumns.cc index 502cb84..7a9cab0 100644 --- a/livestatus/src/TableColumns.cc +++ b/livestatus/src/TableColumns.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "TableColumns.h" +#include <map> #include <memory> #include "Column.h" #include "ColumnsColumn.h" diff --git a/livestatus/src/TableCommands.cc b/livestatus/src/TableCommands.cc index 9d0961c..9337a67 100644 --- a/livestatus/src/TableCommands.cc +++ b/livestatus/src/TableCommands.cc @@ -24,6 +24,7 @@ #include "TableCommands.h" #include <memory> +#include <vector> #include "Column.h" #include "MonitoringCore.h" #include "OffsetSStringColumn.h" diff --git a/livestatus/src/TableComments.cc b/livestatus/src/TableComments.cc index 86b0ea7..9fc3a64 100644 --- a/livestatus/src/TableComments.cc +++ b/livestatus/src/TableComments.cc @@ -27,6 +27,7 @@ #include <utility> #include "Column.h" #include "DowntimeOrComment.h" +#include "DowntimesOrComments.h" #include "MonitoringCore.h" #include "OffsetBoolColumn.h" #include "OffsetIntColumn.h" diff --git a/livestatus/src/TableDowntimes.cc b/livestatus/src/TableDowntimes.cc index 7bdc5ca..9f86ed6 100644 --- a/livestatus/src/TableDowntimes.cc +++ b/livestatus/src/TableDowntimes.cc @@ -27,6 +27,7 @@ #include <utility> #include "Column.h" #include "DowntimeOrComment.h" +#include "DowntimesOrComments.h" #include "MonitoringCore.h" #include "OffsetBoolColumn.h" #include "OffsetIntColumn.h" diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 2ec373d..9085ad4 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -50,6 +50,7 @@ #include "ChronoUtils.h" #include "ClientQueue.h" #include "DowntimeOrComment.h" +#include "DowntimesOrComments.h" #include "InputBuffer.h" #include "LogEntry.h" // IWYU pragma: keep #include "Logger.h"