Module: check_mk
Branch: master
Commit: 2dbc8adddf4f62d67dd617a33dda3ae32289e276
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dbc8adddf4f62…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Mon Mar 20 09:46:37 2017 +0100
More IWYU fixes.
Things are complicated by the fact that there are different versions of the
standard C++ headers out there. In addition, IWYU versions differ a bit,
too.. :-/
Change-Id: I86261b96fad51f544f31c9dbb76538317c8cbcd1
---
livestatus/src/DowntimesOrComments.h | 2 +-
livestatus/src/HostServiceState.h | 8 +++++++-
livestatus/src/LogCache.h | 1 -
livestatus/src/Query.cc | 7 +++++++
livestatus/src/Query.h | 2 +-
livestatus/src/Store.cc | 1 +
livestatus/src/StringUtils.cc | 6 ++++--
livestatus/src/StringUtils.h | 8 ++++----
livestatus/src/Table.cc | 3 ++-
livestatus/src/Table.h | 2 +-
livestatus/src/TableComments.cc | 1 +
livestatus/src/TableContacts.cc | 1 -
livestatus/src/TableDowntimes.cc | 2 +-
livestatus/src/TableHostGroups.cc | 2 +-
livestatus/src/TableHostGroups.h | 2 +-
livestatus/src/TableServiceGroups.cc | 2 +-
livestatus/src/TableServiceGroups.h | 2 +-
livestatus/src/TableStateHistory.h | 1 +
livestatus/src/auth.h | 8 ++++----
livestatus/src/module.cc | 1 -
livestatus/src/unixcat.cc | 1 -
21 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/livestatus/src/DowntimesOrComments.h b/livestatus/src/DowntimesOrComments.h
index fd0e2a8..3ab368e 100644
--- a/livestatus/src/DowntimesOrComments.h
+++ b/livestatus/src/DowntimesOrComments.h
@@ -28,8 +28,8 @@
#include "config.h" // IWYU pragma: keep
#include <map>
#include <memory>
-#include "DowntimeOrComment.h" // IWYU pragma: keep
#include "nagios.h"
+class DowntimeOrComment;
class Logger;
class DowntimesOrComments {
diff --git a/livestatus/src/HostServiceState.h b/livestatus/src/HostServiceState.h
index 94f688c..c7bf6a9 100644
--- a/livestatus/src/HostServiceState.h
+++ b/livestatus/src/HostServiceState.h
@@ -29,9 +29,15 @@
#include <ctime>
#include <string> // for string
#include <vector>
-#include "nagios.h" // IWYU pragma: keep
class HostServiceState;
+// for host/service, ugly...
+#ifdef CMC
+#include "cmc.h"
+#else
+#include "nagios.h"
+#endif
+
typedef std::vector<HostServiceState *> HostServices;
typedef void *HostServiceKey;
diff --git a/livestatus/src/LogCache.h b/livestatus/src/LogCache.h
index 2625eec..d1363ca 100644
--- a/livestatus/src/LogCache.h
+++ b/livestatus/src/LogCache.h
@@ -31,7 +31,6 @@
#include <map>
#include <mutex>
#include "FileSystem.h"
-#include "nagios.h" // IWYU pragma: keep
class Column;
class Logfile;
class Logger;
diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc
index f1e84c8..7d5d9d6 100644
--- a/livestatus/src/Query.cc
+++ b/livestatus/src/Query.cc
@@ -44,6 +44,13 @@
#include "strutil.h"
#include "waittriggers.h"
+// for find_contact, ugly...
+#ifdef CMC
+#include "cmc.h"
+#else
+#include "nagios.h"
+#endif
+
extern unsigned long g_max_response_size;
using std::chrono::duration_cast;
diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h
index be641b9..08200d3 100644
--- a/livestatus/src/Query.h
+++ b/livestatus/src/Query.h
@@ -40,8 +40,8 @@
#include "RendererBrokenCSV.h"
#include "StatsColumn.h"
#include "VariadicFilter.h"
+#include "contact_fwd.h"
#include "data_encoding.h"
-#include "nagios.h" // IWYU pragma: keep
#include "opids.h"
class Aggregator;
class Column;
diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc
index cc91d09..2678a57 100644
--- a/livestatus/src/Store.cc
+++ b/livestatus/src/Store.cc
@@ -30,6 +30,7 @@
#include <ostream>
#include <utility>
#include <vector>
+#include "DowntimeOrComment.h" // IWYU pragma: keep
#include "EventConsoleConnection.h"
#include "InputBuffer.h"
#include "Logger.h"
diff --git a/livestatus/src/StringUtils.cc b/livestatus/src/StringUtils.cc
index c6ee095..89e1319 100644
--- a/livestatus/src/StringUtils.cc
+++ b/livestatus/src/StringUtils.cc
@@ -24,12 +24,14 @@
// IWYU pragma: no_include <type_traits>
#include "StringUtils.h"
+#include <algorithm>
+#include <cctype>
+#include <sstream>
+
#ifdef CMC
#include <arpa/inet.h>
#include <sys/socket.h>
#endif
-#include <cctype>
-#include <sstream>
using std::pair;
using std::string;
diff --git a/livestatus/src/StringUtils.h b/livestatus/src/StringUtils.h
index 2561e04..699d5f2 100644
--- a/livestatus/src/StringUtils.h
+++ b/livestatus/src/StringUtils.h
@@ -26,14 +26,14 @@
#define StringUtils_h
#include "config.h" // IWYU pragma: keep
-#ifdef CMC
-#include <netinet/in.h>
-#endif
-#include <algorithm> // IWYU pragma: keep
#include <string>
#include <utility>
#include <vector>
+#ifdef CMC
+#include <netinet/in.h>
+#endif
+
namespace mk {
std::string unsafe_tolower(const std::string &str);
#ifdef CMC
diff --git a/livestatus/src/Table.cc b/livestatus/src/Table.cc
index 5e39478..50802e4 100644
--- a/livestatus/src/Table.cc
+++ b/livestatus/src/Table.cc
@@ -22,6 +22,8 @@
// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
// Boston, MA 02110-1301 USA.
+// IWYU pragma: no_include "cmc.h"
+// IWYU pragma: no_include "nagios.h"
#include "Table.h"
#include <cassert>
#include <ostream>
@@ -30,7 +32,6 @@
#include "Logger.h"
#include "MonitoringCore.h"
#include "StringUtils.h"
-#include "contact_fwd.h"
using mk::starts_with;
using std::move;
diff --git a/livestatus/src/Table.h b/livestatus/src/Table.h
index 80195a7..66b2edf 100644
--- a/livestatus/src/Table.h
+++ b/livestatus/src/Table.h
@@ -31,7 +31,7 @@
#include <memory>
#include <string>
#include <utility>
-#include "nagios.h" // IWYU pragma: keep
+#include "contact_fwd.h"
class Column;
class DynamicColumn;
class Logger;
diff --git a/livestatus/src/TableComments.cc b/livestatus/src/TableComments.cc
index ec8e43f..964f396 100644
--- a/livestatus/src/TableComments.cc
+++ b/livestatus/src/TableComments.cc
@@ -37,6 +37,7 @@
#include "TableHosts.h"
#include "TableServices.h"
#include "auth.h"
+#include "nagios.h"
using std::make_unique;
using std::string;
diff --git a/livestatus/src/TableContacts.cc b/livestatus/src/TableContacts.cc
index 3dbc6b9..7396036 100644
--- a/livestatus/src/TableContacts.cc
+++ b/livestatus/src/TableContacts.cc
@@ -34,7 +34,6 @@
#include "OffsetStringColumn.h"
#include "Query.h"
#include "TimeperiodColumn.h"
-#include "contact_fwd.h"
#include "nagios.h"
using std::make_unique;
diff --git a/livestatus/src/TableDowntimes.cc b/livestatus/src/TableDowntimes.cc
index 4588470..8cb32fd 100644
--- a/livestatus/src/TableDowntimes.cc
+++ b/livestatus/src/TableDowntimes.cc
@@ -27,7 +27,6 @@
#include <utility>
#include "Column.h"
#include "DowntimeOrComment.h"
-#include "DowntimesOrComments.h" // IWYU pragma: keep
#include "MonitoringCore.h"
#include "OffsetBoolColumn.h"
#include "OffsetIntColumn.h"
@@ -38,6 +37,7 @@
#include "TableHosts.h"
#include "TableServices.h"
#include "auth.h"
+#include "nagios.h"
using std::make_unique;
using std::string;
diff --git a/livestatus/src/TableHostGroups.cc b/livestatus/src/TableHostGroups.cc
index 920c490..3c861d3 100644
--- a/livestatus/src/TableHostGroups.cc
+++ b/livestatus/src/TableHostGroups.cc
@@ -30,7 +30,7 @@
#include "OffsetStringColumn.h"
#include "Query.h"
#include "auth.h"
-#include "contact_fwd.h"
+#include "nagios.h"
using std::make_unique;
using std::string;
diff --git a/livestatus/src/TableHostGroups.h b/livestatus/src/TableHostGroups.h
index 2fac3ef..78b403d 100644
--- a/livestatus/src/TableHostGroups.h
+++ b/livestatus/src/TableHostGroups.h
@@ -28,7 +28,7 @@
#include "config.h" // IWYU pragma: keep
#include <string>
#include "Table.h"
-#include "nagios.h" // IWYU pragma: keep
+#include "contact_fwd.h"
class MonitoringCore;
class Query;
diff --git a/livestatus/src/TableServiceGroups.cc b/livestatus/src/TableServiceGroups.cc
index 40e2e65..86f0f43 100644
--- a/livestatus/src/TableServiceGroups.cc
+++ b/livestatus/src/TableServiceGroups.cc
@@ -30,7 +30,7 @@
#include "ServiceListColumn.h"
#include "ServiceListStateColumn.h"
#include "auth.h"
-#include "contact_fwd.h"
+#include "nagios.h"
using std::make_unique;
using std::string;
diff --git a/livestatus/src/TableServiceGroups.h b/livestatus/src/TableServiceGroups.h
index c8fa140..1269bca 100644
--- a/livestatus/src/TableServiceGroups.h
+++ b/livestatus/src/TableServiceGroups.h
@@ -28,7 +28,7 @@
#include "config.h" // IWYU pragma: keep
#include <string>
#include "Table.h"
-#include "nagios.h" // IWYU pragma: keep
+#include "contact_fwd.h"
class MonitoringCore;
class Query;
diff --git a/livestatus/src/TableStateHistory.h b/livestatus/src/TableStateHistory.h
index c54f7d7..b2f91c1 100644
--- a/livestatus/src/TableStateHistory.h
+++ b/livestatus/src/TableStateHistory.h
@@ -28,6 +28,7 @@
// IWYU pragma: no_include <bits/shared_ptr.h>
#include "config.h" // IWYU pragma: keep
#include <map>
+#include <memory> // IWYU pragma: keep
#include <string>
#include "LogCache.h"
#include "Logfile.h"
diff --git a/livestatus/src/auth.h b/livestatus/src/auth.h
index 2d1b0bc..0b42b14 100644
--- a/livestatus/src/auth.h
+++ b/livestatus/src/auth.h
@@ -28,16 +28,16 @@
#include "config.h" // IWYU pragma: keep
#ifdef CMC
-class Contact;
+#include "contact_fwd.h"
#else
-#include "nagios.h" // IWYU pragma: keep
+#include "nagios.h"
#endif
enum class AuthorizationKind { loose = 0, strict = 1 };
#ifdef CMC
-inline Contact *unknown_auth_user() {
- return reinterpret_cast<Contact *>(0xdeadbeaf);
+inline contact *unknown_auth_user() {
+ return reinterpret_cast<contact *>(0xdeadbeaf);
}
#else
extern AuthorizationKind g_service_authorization;
diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc
index dc4cf9a..8f2af50 100644
--- a/livestatus/src/module.cc
+++ b/livestatus/src/module.cc
@@ -32,7 +32,6 @@
#include <sys/select.h>
#include <sys/socket.h>
#include <sys/stat.h>
-#include <sys/types.h> // IWYU pragma: keep
#include <sys/un.h>
#include <unistd.h>
#include <chrono>
diff --git a/livestatus/src/unixcat.cc b/livestatus/src/unixcat.cc
index 514154b..2da2d9c 100644
--- a/livestatus/src/unixcat.cc
+++ b/livestatus/src/unixcat.cc
@@ -26,7 +26,6 @@
#include <sys/select.h>
#include <sys/socket.h>
#include <sys/stat.h>
-#include <sys/types.h> // IWYU pragma: keep
#include <sys/un.h>
#include <unistd.h>
#include <cerrno>