Module: check_mk
Branch: master
Commit: 64dca2cbc31d2c9aaf2472792336bb3c16949c0a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64dca2cbc31d2c…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Thu Apr 21 11:49:26 2016 +0200
Fetched livestatus from downstream.
---
livestatus/src/TableHosts.h | 11 +++++------
livestatus/src/TableHostsByGroup.h | 7 ++++---
livestatus/src/TableLog.cc | 3 +--
livestatus/src/TableLog.h | 9 +++++----
livestatus/src/TableServices.h | 11 +++++------
livestatus/src/TableServicesByGroup.h | 7 ++++---
livestatus/src/TableServicesByHostGroup.h | 7 ++++---
livestatus/src/TableStateHistory.cc | 4 ++--
livestatus/src/TableStateHistory.h | 8 ++++----
9 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/livestatus/src/TableHosts.h b/livestatus/src/TableHosts.h
index f50fcaf..c9084f8 100644
--- a/livestatus/src/TableHosts.h
+++ b/livestatus/src/TableHosts.h
@@ -31,7 +31,8 @@
#include "nagios.h" // IWYU pragma: keep
#ifdef CMC
#include <mutex>
-#include "Core.h"
+struct Core;
+class Notes;
#else
class DowntimesOrComments;
#endif
@@ -40,13 +41,11 @@ class Query;
class TableHosts : public Table {
public:
#ifdef CMC
- TableHosts(const Core::_notes_t &downtimes_holder,
- const Core::_notes_t &comments_holder,
+ TableHosts(const Notes &downtimes_holder, const Notes &comments_holder,
std::recursive_mutex &holder_lock, Core *core);
static void addColumns(Table *, std::string prefix, int indirect_offset,
- int extra_offset,
- const Core::_notes_t &downtimes_holder,
- const Core::_notes_t &comments_holder,
+ int extra_offset, const Notes &downtimes_holder,
+ const Notes &comments_holder,
std::recursive_mutex &holder_lock, Core *core);
#else
TableHosts(const DowntimesOrComments &downtimes_holder,
diff --git a/livestatus/src/TableHostsByGroup.h b/livestatus/src/TableHostsByGroup.h
index a0db6e3..c8a9557 100644
--- a/livestatus/src/TableHostsByGroup.h
+++ b/livestatus/src/TableHostsByGroup.h
@@ -30,7 +30,8 @@
#include "nagios.h" // IWYU pragma: keep
#ifdef CMC
#include <mutex>
-#include "Core.h"
+struct Core;
+class Notes;
#else
class DowntimesOrComments;
#endif
@@ -39,8 +40,8 @@ class Query;
class TableHostsByGroup : public Table {
public:
#ifdef CMC
- TableHostsByGroup(const Core::_notes_t &downtimes_holder,
- const Core::_notes_t &comments_holder,
+ TableHostsByGroup(const Notes &downtimes_holder,
+ const Notes &comments_holder,
std::recursive_mutex &holder_lock, Core *core);
#else
TableHostsByGroup(const DowntimesOrComments &_downtimes_holder,
diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc
index 5aea45a..41a1f5a 100644
--- a/livestatus/src/TableLog.cc
+++ b/livestatus/src/TableLog.cc
@@ -53,8 +53,7 @@ using std::string;
TableLog::TableLog(LogCache *log_cache,
#ifdef CMC
- const Core::_notes_t &downtimes_holder,
- const Core::_notes_t &comments_holder,
+ const Notes &downtimes_holder, const Notes &comments_holder,
std::recursive_mutex &holder_lock, Core *core
#else
const DowntimesOrComments &downtimes_holder,
diff --git a/livestatus/src/TableLog.h b/livestatus/src/TableLog.h
index 53c494d..6261712 100644
--- a/livestatus/src/TableLog.h
+++ b/livestatus/src/TableLog.h
@@ -32,7 +32,8 @@
class Column;
#ifdef CMC
#include <mutex>
-#include "Core.h"
+struct Core;
+class Notes;
#else
class DowntimesOrComments;
#endif
@@ -43,9 +44,9 @@ class Query;
class TableLog : public Table {
public:
#ifdef CMC
- TableLog(LogCache *log_cache, const Core::_notes_t &downtimes_holder,
- const Core::_notes_t &comments_holder,
- std::recursive_mutex &holder_lock, Core *core);
+ TableLog(LogCache *log_cache, const Notes &downtimes_holder,
+ const Notes &comments_holder, std::recursive_mutex &holder_lock,
+ Core *core);
#else
TableLog(LogCache *log_cache, const DowntimesOrComments &downtimes_holder,
const DowntimesOrComments &comments_holder);
diff --git a/livestatus/src/TableServices.h b/livestatus/src/TableServices.h
index 046e388..0aeed18 100644
--- a/livestatus/src/TableServices.h
+++ b/livestatus/src/TableServices.h
@@ -31,7 +31,8 @@
#include "nagios.h" // IWYU pragma: keep
#ifdef CMC
#include <mutex>
-#include "Core.h"
+struct Core;
+class Notes;
#else
class DowntimesOrComments;
#endif
@@ -40,13 +41,11 @@ class Query;
class TableServices : public Table {
public:
#ifdef CMC
- TableServices(const Core::_notes_t &downtimes_holder,
- const Core::_notes_t &comments_holder,
+ TableServices(const Notes &downtimes_holder, const Notes &comments_holder,
std::recursive_mutex &holder_lock, Core *core);
static void addColumns(Table *, std::string prefix, int indirect_offset,
- bool add_hosts,
- const Core::_notes_t &downtimes_holder,
- const Core::_notes_t &comments_holder,
+ bool add_hosts, const Notes &downtimes_holder,
+ const Notes &comments_holder,
std::recursive_mutex &holder_lock, Core *core);
#else
TableServices(const DowntimesOrComments &downtimes_holder,
diff --git a/livestatus/src/TableServicesByGroup.h
b/livestatus/src/TableServicesByGroup.h
index aa65f7a..01238e4 100644
--- a/livestatus/src/TableServicesByGroup.h
+++ b/livestatus/src/TableServicesByGroup.h
@@ -30,7 +30,8 @@
#include "nagios.h" // IWYU pragma: keep
#ifdef CMC
#include <mutex>
-#include "Core.h"
+struct Core;
+class Notes;
#else
class DowntimesOrComments;
#endif
@@ -39,8 +40,8 @@ class Query;
class TableServicesByGroup : public Table {
public:
#ifdef CMC
- TableServicesByGroup(const Core::_notes_t &downtimes_holder,
- const Core::_notes_t &comments_holder,
+ TableServicesByGroup(const Notes &downtimes_holder,
+ const Notes &comments_holder,
std::recursive_mutex &holder_lock, Core *core);
#else
TableServicesByGroup(const DowntimesOrComments &downtimes_holder,
diff --git a/livestatus/src/TableServicesByHostGroup.h
b/livestatus/src/TableServicesByHostGroup.h
index d59c87a..795b0a0 100644
--- a/livestatus/src/TableServicesByHostGroup.h
+++ b/livestatus/src/TableServicesByHostGroup.h
@@ -30,7 +30,8 @@
#include "nagios.h" // IWYU pragma: keep
#ifdef CMC
#include <mutex>
-#include "Core.h"
+struct Core;
+class Notes;
#else
class DowntimesOrComments;
#endif
@@ -39,8 +40,8 @@ class Query;
class TableServicesByHostGroup : public Table {
public:
#ifdef CMC
- TableServicesByHostGroup(const Core::_notes_t &downtimes_holder,
- const Core::_notes_t &comments_holder,
+ TableServicesByHostGroup(const Notes &downtimes_holder,
+ const Notes &comments_holder,
std::recursive_mutex &holder_lock, Core *core);
#else
TableServicesByHostGroup(const DowntimesOrComments &downtimes_holder,
diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc
index f738c96..c02a063 100644
--- a/livestatus/src/TableStateHistory.cc
+++ b/livestatus/src/TableStateHistory.cc
@@ -82,8 +82,8 @@ const char *getCustomVariable(customvariablesmember *cvm, const char
*name) {
TableStateHistory::TableStateHistory(LogCache *log_cache,
#ifdef CMC
- const Core::_notes_t &downtimes_holder,
- const Core::_notes_t &comments_holder,
+ const Notes &downtimes_holder,
+ const Notes &comments_holder,
recursive_mutex &holder_lock, Core *core
#else
const DowntimesOrComments
diff --git a/livestatus/src/TableStateHistory.h b/livestatus/src/TableStateHistory.h
index 9f0068b..784bb62 100644
--- a/livestatus/src/TableStateHistory.h
+++ b/livestatus/src/TableStateHistory.h
@@ -35,7 +35,8 @@
class Column;
#ifdef CMC
#include <mutex>
-#include "Core.h"
+struct Core;
+class Notes;
#else
class DowntimesOrComments;
#endif
@@ -70,9 +71,8 @@ protected:
public:
#ifdef CMC
- TableStateHistory(LogCache *log_cache,
- const Core::_notes_t &downtimes_holder,
- const Core::_notes_t &comments_holder,
+ TableStateHistory(LogCache *log_cache, const Notes &downtimes_holder,
+ const Notes &comments_holder,
std::recursive_mutex &holder_lock, Core *core);
#else
TableStateHistory(LogCache *log_cache,