[checkmk-commits] Fetched livestatus from downstream.

Sven Panne sp at mathias-kettner.de
Tue Dec 27 10:36:22 CET 2016


Module: check_mk
Branch: master
Commit: eebe2d608639b2ffef9f3625a406be55a959b70d
URL:    http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eebe2d608639b2ffef9f3625a406be55a959b70d

Author: Sven Panne <sp at mathias-kettner.de>
Date:   Tue Dec 27 10:35:58 2016 +0100

Fetched livestatus from downstream.

Change-Id: I2a5a57f33007c1f7867fcd2f2f80e5acfd016c7d

---

 livestatus/src/ContactGroupsMemberColumn.h | 2 --
 livestatus/src/ContactsColumn.h            | 2 --
 livestatus/src/DownCommColumn.h            | 2 --
 livestatus/src/HostContactsColumn.h        | 2 --
 livestatus/src/HostGroupsColumn.h          | 2 --
 livestatus/src/ServiceContactsColumn.h     | 2 --
 livestatus/src/ServiceGroupsColumn.h       | 2 --
 7 files changed, 14 deletions(-)

diff --git a/livestatus/src/ContactGroupsMemberColumn.h b/livestatus/src/ContactGroupsMemberColumn.h
index 4a1df0b..73dd332 100644
--- a/livestatus/src/ContactGroupsMemberColumn.h
+++ b/livestatus/src/ContactGroupsMemberColumn.h
@@ -28,7 +28,6 @@
 #include "config.h"  // IWYU pragma: keep
 #include <memory>
 #include <string>
-#include "Column.h"
 #include "ContactsColumn.h"
 #include "nagios.h"
 
@@ -38,7 +37,6 @@ public:
                               const std::string& description,
                               int indirect_offset, int extra_offset = -1)
         : ContactsColumn(name, description, indirect_offset, extra_offset) {}
-    ColumnType type() override { return ColumnType::list; }
     std::unique_ptr<Contains> makeContains(const std::string& name) override;
     std::unique_ptr<Contains> containsContact(contact* ctc) override;
 };
diff --git a/livestatus/src/ContactsColumn.h b/livestatus/src/ContactsColumn.h
index 87dc8c8..e08213f 100644
--- a/livestatus/src/ContactsColumn.h
+++ b/livestatus/src/ContactsColumn.h
@@ -28,7 +28,6 @@
 #include "config.h"  // IWYU pragma: keep
 #include <memory>
 #include <string>
-#include "Column.h"
 #include "ListColumn.h"
 #include "nagios.h"
 class RowRenderer;
@@ -38,7 +37,6 @@ public:
     ContactsColumn(const std::string &name, const std::string &description,
                    int indirect_offset, int extra_offset)
         : ListColumn(name, description, indirect_offset, extra_offset) {}
-    ColumnType type() override { return ColumnType::list; }
     virtual std::unique_ptr<Contains> containsContact(contact *ctc) = 0;
     bool isEmpty(void *data) override;
     void output(void *row, RowRenderer &r, contact *auth_user) override;
diff --git a/livestatus/src/DownCommColumn.h b/livestatus/src/DownCommColumn.h
index f1c5371..835be64 100644
--- a/livestatus/src/DownCommColumn.h
+++ b/livestatus/src/DownCommColumn.h
@@ -28,7 +28,6 @@
 #include "config.h"  // IWYU pragma: keep
 #include <memory>
 #include <string>
-#include "Column.h"
 #include "ListColumn.h"
 #include "nagios.h"
 class DowntimeOrComment;
@@ -55,7 +54,6 @@ public:
         , _with_info(with_info)
         , _is_service(is_service)
         , _with_extra_info(with_extra_info) {}
-    ColumnType type() override { return ColumnType::list; }
     std::unique_ptr<Contains> makeContains(const std::string &name) override;
     void output(void *row, RowRenderer &r, contact *auth_user) override;
     bool isEmpty(void *data) override;
diff --git a/livestatus/src/HostContactsColumn.h b/livestatus/src/HostContactsColumn.h
index 96b7a4c..0b4b0ce 100644
--- a/livestatus/src/HostContactsColumn.h
+++ b/livestatus/src/HostContactsColumn.h
@@ -28,7 +28,6 @@
 #include "config.h"  // IWYU pragma: keep
 #include <memory>
 #include <string>
-#include "Column.h"
 #include "ContactsColumn.h"
 #include "nagios.h"
 
@@ -38,7 +37,6 @@ public:
                        int indirect_offset, int extra_offset = -1)
         : ContactsColumn(name, description, indirect_offset,
                          extra_offset = -1) {}
-    ColumnType type() override { return ColumnType::list; }
     std::unique_ptr<Contains> makeContains(const std::string& name) override;
     std::unique_ptr<Contains> containsContact(contact* ctc) override;
 };
diff --git a/livestatus/src/HostGroupsColumn.h b/livestatus/src/HostGroupsColumn.h
index 14b1fe2..b61162b 100644
--- a/livestatus/src/HostGroupsColumn.h
+++ b/livestatus/src/HostGroupsColumn.h
@@ -28,7 +28,6 @@
 #include "config.h"  // IWYU pragma: keep
 #include <memory>
 #include <string>
-#include "Column.h"
 #include "ListColumn.h"
 #include "nagios.h"
 class RowRenderer;
@@ -41,7 +40,6 @@ public:
                      int offset, int indirect_offset, int extra_offset = -1)
         : ListColumn(name, description, indirect_offset, extra_offset)
         , _offset(offset) {}
-    ColumnType type() override { return ColumnType::list; }
     std::unique_ptr<Contains> makeContains(const std::string &name) override;
     void output(void *row, RowRenderer &r, contact *auth_user) override;
     bool isEmpty(void *data) override;
diff --git a/livestatus/src/ServiceContactsColumn.h b/livestatus/src/ServiceContactsColumn.h
index 283df85..102f3b0 100644
--- a/livestatus/src/ServiceContactsColumn.h
+++ b/livestatus/src/ServiceContactsColumn.h
@@ -28,7 +28,6 @@
 #include "config.h"  // IWYU pragma: keep
 #include <memory>
 #include <string>
-#include "Column.h"
 #include "ContactsColumn.h"
 #include "nagios.h"
 
@@ -38,7 +37,6 @@ public:
                           const std::string& description, int indirect_offset,
                           int extra_offset = -1)
         : ContactsColumn(name, description, indirect_offset, extra_offset) {}
-    ColumnType type() override { return ColumnType::list; }
     std::unique_ptr<Contains> makeContains(const std::string& name) override;
     std::unique_ptr<Contains> containsContact(contact* ctc) override;
 };
diff --git a/livestatus/src/ServiceGroupsColumn.h b/livestatus/src/ServiceGroupsColumn.h
index eadfb28..f57442c 100644
--- a/livestatus/src/ServiceGroupsColumn.h
+++ b/livestatus/src/ServiceGroupsColumn.h
@@ -28,7 +28,6 @@
 #include "config.h"  // IWYU pragma: keep
 #include <memory>
 #include <string>
-#include "Column.h"
 #include "ListColumn.h"
 #include "nagios.h"
 class RowRenderer;
@@ -41,7 +40,6 @@ public:
                         int offset, int indirect_offset, int extra_offset = -1)
         : ListColumn(name, description, indirect_offset, extra_offset)
         , _offset(offset) {}
-    ColumnType type() override { return ColumnType::list; }
     void output(void *row, RowRenderer &r, contact *auth_user) override;
     std::unique_ptr<Contains> makeContains(const std::string &name) override;
     bool isEmpty(void *data) override;



More information about the checkmk-commits mailing list