Module: check_mk
Branch: master
Commit: 05df67b0f1cdaadbd15083ca122c9ece8e941990
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05df67b0f1cdaa…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Wed Nov 23 10:20:00 2016 +0100
Removed default arguments from AttributeListColumn constructor.
A small step towards taming this monster...
---
livestatus/src/AttributeListColumn.h | 2 +-
livestatus/src/TableContacts.cc | 4 ++--
livestatus/src/TableHosts.cc | 4 ++--
livestatus/src/TableServices.cc | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/livestatus/src/AttributeListColumn.h b/livestatus/src/AttributeListColumn.h
index c097823..526f865 100644
--- a/livestatus/src/AttributeListColumn.h
+++ b/livestatus/src/AttributeListColumn.h
@@ -49,7 +49,7 @@ class AttributeListColumn : public IntColumn {
public:
AttributeListColumn(const std::string &name, const std::string &description,
int offset, int indirect_offset, bool show_list,
- int extra_offset = -1, int extra_extra_offset = -1)
+ int extra_offset, int extra_extra_offset)
: IntColumn(name, description, indirect_offset, extra_offset,
extra_extra_offset)
, _offset(offset)
diff --git a/livestatus/src/TableContacts.cc b/livestatus/src/TableContacts.cc
index b90a3bc..1c632ea 100644
--- a/livestatus/src/TableContacts.cc
+++ b/livestatus/src/TableContacts.cc
@@ -132,12 +132,12 @@ void TableContacts::addColumns(Table *table, const string
&prefix,
prefix + "modified_attributes",
"A bitmask specifying which attributes have been modified",
reinterpret_cast<char *>(&ctc.modified_attributes) - ref,
- indirect_offset, false));
+ indirect_offset, false, -1, -1));
table->addColumn(new AttributeListColumn(
prefix + "modified_attributes_list",
"A list of all modified attributes",
reinterpret_cast<char *>(&ctc.modified_attributes) - ref,
- indirect_offset, true));
+ indirect_offset, true, -1, -1));
}
void TableContacts::answerQuery(Query *query) {
diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc
index 2bf2fd3..c93e6fb 100644
--- a/livestatus/src/TableHosts.cc
+++ b/livestatus/src/TableHosts.cc
@@ -414,12 +414,12 @@ void TableHosts::addColumns(Table *table, const string &prefix,
prefix + "modified_attributes",
"A bitmask specifying which attributes have been modified",
reinterpret_cast<char *>(&hst.modified_attributes) - ref,
- indirect_offset, false, extra_offset));
+ indirect_offset, false, extra_offset, -1));
table->addColumn(new AttributeListColumn(
prefix + "modified_attributes_list",
"A list of all modified attributes",
reinterpret_cast<char *>(&hst.modified_attributes) - ref,
- indirect_offset, true, extra_offset));
+ indirect_offset, true, extra_offset, -1));
// columns of type double
table->addColumn(new OffsetDoubleColumn(
diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc
index f3cabdf..f54ecac 100644
--- a/livestatus/src/TableServices.cc
+++ b/livestatus/src/TableServices.cc
@@ -350,12 +350,12 @@ void TableServices::addColumns(Table *table, const string
&prefix,
prefix + "modified_attributes",
"A bitmask specifying which attributes have been modified",
reinterpret_cast<char *>(&svc.modified_attributes) - ref,
- indirect_offset, false));
+ indirect_offset, false, -1, -1));
table->addColumn(new AttributeListColumn(
prefix + "modified_attributes_list",
"A list of all modified attributes",
reinterpret_cast<char *>(&svc.modified_attributes) - ref,
- indirect_offset, true));
+ indirect_offset, true, -1, -1));
table->addColumn(new ServiceSpecialIntColumn(
prefix + "pnpgraph_present",
"Whether there is a PNP4Nagios graph present for this service (0/1)",