Module: check_mk
Branch: master
Commit: 18b0391de5260fd4853dbebbf84b83aa1ea9e8d5
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18b0391de5260f…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Mon Jun 6 15:06:33 2016 +0200
Fetched Livestatus from downstream.
---
livestatus/src/DownCommColumn.h | 2 +-
livestatus/src/DowntimeOrComment.h | 9 ++++++---
livestatus/src/HostServiceState.h | 5 +++--
livestatus/src/LogCache.h | 2 +-
livestatus/src/Logfile.h | 2 +-
livestatus/src/MetricsColumn.h | 2 +-
livestatus/src/TableEventConsole.h | 2 +-
livestatus/src/TableEventConsoleEvents.h | 2 +-
livestatus/src/TableEventConsoleHistory.h | 2 +-
livestatus/src/TableEventConsoleStatus.h | 2 +-
livestatus/src/TableHosts.h | 2 +-
livestatus/src/TableHostsByGroup.h | 2 +-
livestatus/src/TableLog.h | 2 +-
livestatus/src/TableServices.h | 2 +-
livestatus/src/TableServicesByGroup.h | 2 +-
livestatus/src/TableServicesByHostGroup.h | 2 +-
livestatus/src/TableStateHistory.h | 4 ++--
livestatus/src/TableStatus.h | 2 +-
18 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/livestatus/src/DownCommColumn.h b/livestatus/src/DownCommColumn.h
index b049eba..efdc7bc 100644
--- a/livestatus/src/DownCommColumn.h
+++ b/livestatus/src/DownCommColumn.h
@@ -29,7 +29,7 @@
#include <string>
#include "Column.h"
#include "ListColumn.h"
-struct DowntimeOrComment;
+class DowntimeOrComment;
class DowntimesOrComments;
class Query;
diff --git a/livestatus/src/DowntimeOrComment.h b/livestatus/src/DowntimeOrComment.h
index bfc082f..e74f4d9 100644
--- a/livestatus/src/DowntimeOrComment.h
+++ b/livestatus/src/DowntimeOrComment.h
@@ -78,7 +78,8 @@
}nebstruct_comment_data;
*/
-struct DowntimeOrComment {
+class DowntimeOrComment {
+public:
int _type;
host *_host;
service *_service;
@@ -92,7 +93,8 @@ struct DowntimeOrComment {
virtual ~DowntimeOrComment();
};
-struct Downtime : public DowntimeOrComment {
+class Downtime : public DowntimeOrComment {
+public:
time_t _start_time;
time_t _end_time;
int _fixed;
@@ -101,7 +103,8 @@ struct Downtime : public DowntimeOrComment {
explicit Downtime(nebstruct_downtime_struct *dt);
};
-struct Comment : public DowntimeOrComment {
+class Comment : public DowntimeOrComment {
+public:
time_t _expire_time;
int _persistent;
int _source;
diff --git a/livestatus/src/HostServiceState.h b/livestatus/src/HostServiceState.h
index 9ae14e6..7df779b 100644
--- a/livestatus/src/HostServiceState.h
+++ b/livestatus/src/HostServiceState.h
@@ -30,13 +30,14 @@
#include <time.h>
#include <vector>
#include "nagios.h" // IWYU pragma: keep
-struct HostServiceState;
+class HostServiceState;
typedef std::vector<HostServiceState *> HostServices;
typedef void *HostServiceKey;
-struct HostServiceState {
+class HostServiceState {
+public:
bool _is_host;
time_t _time;
int _lineno;
diff --git a/livestatus/src/LogCache.h b/livestatus/src/LogCache.h
index 778f3fa..d436de3 100644
--- a/livestatus/src/LogCache.h
+++ b/livestatus/src/LogCache.h
@@ -33,7 +33,7 @@
class Column;
class CommandsHolder;
#ifdef CMC
-struct Core;
+class Core;
#endif
class Logfile;
diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h
index d450803..9e14d6e 100644
--- a/livestatus/src/Logfile.h
+++ b/livestatus/src/Logfile.h
@@ -36,7 +36,7 @@ class Query;
struct LogEntry;
#ifdef CMC
-struct World;
+class World;
#endif
#define MAX_LOGLINE 65536
diff --git a/livestatus/src/MetricsColumn.h b/livestatus/src/MetricsColumn.h
index 64e5b51..4ecb77a 100644
--- a/livestatus/src/MetricsColumn.h
+++ b/livestatus/src/MetricsColumn.h
@@ -29,7 +29,7 @@
#include <string>
#include "Column.h"
#ifdef CMC
-struct Core;
+class Core;
#endif
class Query;
diff --git a/livestatus/src/TableEventConsole.h b/livestatus/src/TableEventConsole.h
index eb63163..32eee11 100644
--- a/livestatus/src/TableEventConsole.h
+++ b/livestatus/src/TableEventConsole.h
@@ -43,7 +43,7 @@
#include "Table.h"
#ifdef CMC
#include "cmc.h"
-struct Core;
+class Core;
#else
#include "nagios.h"
#endif
diff --git a/livestatus/src/TableEventConsoleEvents.h
b/livestatus/src/TableEventConsoleEvents.h
index 56f75ac..bfead95 100644
--- a/livestatus/src/TableEventConsoleEvents.h
+++ b/livestatus/src/TableEventConsoleEvents.h
@@ -30,7 +30,7 @@
class Table;
#ifdef CMC
#include <mutex>
-struct Core;
+class Core;
class Notes;
#else
class DowntimesOrComments;
diff --git a/livestatus/src/TableEventConsoleHistory.h
b/livestatus/src/TableEventConsoleHistory.h
index f8e73bd..e4b16b9 100644
--- a/livestatus/src/TableEventConsoleHistory.h
+++ b/livestatus/src/TableEventConsoleHistory.h
@@ -29,7 +29,7 @@
#include "TableEventConsole.h"
#ifdef CMC
#include <mutex>
-struct Core;
+class Core;
class Notes;
#else
class DowntimesOrComments;
diff --git a/livestatus/src/TableEventConsoleStatus.h
b/livestatus/src/TableEventConsoleStatus.h
index 23d9d9e..5726ede 100644
--- a/livestatus/src/TableEventConsoleStatus.h
+++ b/livestatus/src/TableEventConsoleStatus.h
@@ -28,7 +28,7 @@
#include "config.h" // IWYU pragma: keep
#include "TableEventConsole.h"
#ifdef CMC
-struct Core;
+class Core;
#endif
class TableEventConsoleStatus : public TableEventConsole {
diff --git a/livestatus/src/TableHosts.h b/livestatus/src/TableHosts.h
index 4aec773..075eceb 100644
--- a/livestatus/src/TableHosts.h
+++ b/livestatus/src/TableHosts.h
@@ -31,7 +31,7 @@
#include "nagios.h" // IWYU pragma: keep
#ifdef CMC
#include <mutex>
-struct Core;
+class Core;
class Notes;
#else
class DowntimesOrComments;
diff --git a/livestatus/src/TableHostsByGroup.h b/livestatus/src/TableHostsByGroup.h
index ccb3bec..9573592 100644
--- a/livestatus/src/TableHostsByGroup.h
+++ b/livestatus/src/TableHostsByGroup.h
@@ -30,7 +30,7 @@
#include "nagios.h" // IWYU pragma: keep
#ifdef CMC
#include <mutex>
-struct Core;
+class Core;
class Notes;
#else
class DowntimesOrComments;
diff --git a/livestatus/src/TableLog.h b/livestatus/src/TableLog.h
index 5d40d28..8ba78a4 100644
--- a/livestatus/src/TableLog.h
+++ b/livestatus/src/TableLog.h
@@ -32,7 +32,7 @@
class Column;
#ifdef CMC
#include <mutex>
-struct Core;
+class Core;
class Notes;
#else
class DowntimesOrComments;
diff --git a/livestatus/src/TableServices.h b/livestatus/src/TableServices.h
index 8fc3980..b87e766 100644
--- a/livestatus/src/TableServices.h
+++ b/livestatus/src/TableServices.h
@@ -31,7 +31,7 @@
#include "nagios.h" // IWYU pragma: keep
#ifdef CMC
#include <mutex>
-struct Core;
+class Core;
class Notes;
#else
class DowntimesOrComments;
diff --git a/livestatus/src/TableServicesByGroup.h
b/livestatus/src/TableServicesByGroup.h
index 5024d2a..d10a7de 100644
--- a/livestatus/src/TableServicesByGroup.h
+++ b/livestatus/src/TableServicesByGroup.h
@@ -30,7 +30,7 @@
#include "nagios.h" // IWYU pragma: keep
#ifdef CMC
#include <mutex>
-struct Core;
+class Core;
class Notes;
#else
class DowntimesOrComments;
diff --git a/livestatus/src/TableServicesByHostGroup.h
b/livestatus/src/TableServicesByHostGroup.h
index afe11bd..9519141 100644
--- a/livestatus/src/TableServicesByHostGroup.h
+++ b/livestatus/src/TableServicesByHostGroup.h
@@ -30,7 +30,7 @@
#include "nagios.h" // IWYU pragma: keep
#ifdef CMC
#include <mutex>
-struct Core;
+class Core;
class Notes;
#else
class DowntimesOrComments;
diff --git a/livestatus/src/TableStateHistory.h b/livestatus/src/TableStateHistory.h
index 4e461a8..91d2e90 100644
--- a/livestatus/src/TableStateHistory.h
+++ b/livestatus/src/TableStateHistory.h
@@ -35,13 +35,13 @@
class Column;
#ifdef CMC
#include <mutex>
-struct Core;
+class Core;
class Notes;
#else
class DowntimesOrComments;
#endif
class Query;
-struct HostServiceState;
+class HostServiceState;
struct LogEntry;
#define CLASSMASK_STATEHIST 0xC6
diff --git a/livestatus/src/TableStatus.h b/livestatus/src/TableStatus.h
index bca736a..9f9cb3b 100644
--- a/livestatus/src/TableStatus.h
+++ b/livestatus/src/TableStatus.h
@@ -28,7 +28,7 @@
#include "config.h" // IWYU pragma: keep
#include "Table.h"
#ifdef CMC
-struct Core;
+class Core;
#endif
class Query;