1 Apr
2019
1 Apr
'19
9:50 a.m.
Module: check_mk
Branch: master
Commit: 058c70eaa55bcfb6762600cf850f1880144e883f
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=058c70eaa55bcf…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Mon Apr 1 09:44:53 2019 +0200
Yet another attempt to please IWYU, works locally...
Change-Id: Ice3bc7ca080ff37eb8dcfd37a4b44e79338e1449
---
livestatus/src/CustomVarsDictColumn.cc | 3 ---
livestatus/src/CustomVarsDictColumn.h | 4 +++-
livestatus/src/CustomVarsDictFilter.h | 4 +++-
livestatus/src/TableStateHistory.cc | 3 +--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/livestatus/src/CustomVarsDictColumn.cc
b/livestatus/src/CustomVarsDictColumn.cc
index 07d4e3f..955a47f 100644
--- a/livestatus/src/CustomVarsDictColumn.cc
+++ b/livestatus/src/CustomVarsDictColumn.cc
@@ -32,10 +32,7 @@
class Aggregator;
#ifdef CMC
-#include "Entity.h"
#include "cmc.h"
-#else
-#include "nagios.h"
#endif
void CustomVarsDictColumn::output(
diff --git a/livestatus/src/CustomVarsDictColumn.h
b/livestatus/src/CustomVarsDictColumn.h
index 13e852e..e4c706e 100644
--- a/livestatus/src/CustomVarsDictColumn.h
+++ b/livestatus/src/CustomVarsDictColumn.h
@@ -38,7 +38,9 @@ class Aggregator;
class Row;
class RowRenderer;
-#ifndef CMC
+#ifdef CMC
+#include "contact_fwd.h"
+#else
// 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 df7ea03..98a800f 100644
--- a/livestatus/src/CustomVarsDictFilter.h
+++ b/livestatus/src/CustomVarsDictFilter.h
@@ -36,7 +36,9 @@ class CustomVarsDictColumn;
class RegExp;
class Row;
-#ifndef CMC
+#ifdef CMC
+#include "contact_fwd.h"
+#else
// 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 6a8572f..b7cbe6a 100644
--- a/livestatus/src/TableStateHistory.cc
+++ b/livestatus/src/TableStateHistory.cc
@@ -31,7 +31,6 @@
#include <ostream>
#include <set>
#include <stdexcept>
-#include <unordered_map>
#include <utility>
#include <vector>
#include "Column.h"
@@ -58,12 +57,12 @@
#include "Host.h" // IWYU pragma: keep
#include "Service.h" // IWYU pragma: keep
#include "Timeperiod.h"
-#include "cmc.h"
#define STATE_OK 0
#define STATE_WARNING 1
#define STATE_CRITICAL 2
#define STATE_UNKNOWN 3
#else
+#include <unordered_map>
#include "auth.h"
#include "nagios.h"
#endif