From 97a2771a08bc507815c01f262573a23eb1ec1174 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Tue, 5 Nov 2013 13:39:40 +0100 Subject: [PATCH] Livestatus: Fix default column accessor type for comments. refs #5005 --- components/livestatus/table.cpp | 10 +++++----- components/livestatus/table.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/components/livestatus/table.cpp b/components/livestatus/table.cpp index b34f8a15d..c28ef1e9d 100644 --- a/components/livestatus/table.cpp +++ b/components/livestatus/table.cpp @@ -121,27 +121,27 @@ void Table::FilteredAddRow(std::vector& rs, const Filter::Ptr& filter, co rs.push_back(row); } -Value Table::ZeroAccessor(const Object::Ptr&) +Value Table::ZeroAccessor(const Value&) { return 0; } -Value Table::OneAccessor(const Object::Ptr&) +Value Table::OneAccessor(const Value&) { return 1; } -Value Table::EmptyStringAccessor(const Object::Ptr&) +Value Table::EmptyStringAccessor(const Value&) { return ""; } -Value Table::EmptyArrayAccessor(const Object::Ptr&) +Value Table::EmptyArrayAccessor(const Value&) { return boost::make_shared(); } -Value Table::EmptyDictionaryAccessor(const Object::Ptr&) +Value Table::EmptyDictionaryAccessor(const Value&) { return boost::make_shared(); } diff --git a/components/livestatus/table.h b/components/livestatus/table.h index 08b5273ed..745b62e8c 100644 --- a/components/livestatus/table.h +++ b/components/livestatus/table.h @@ -55,11 +55,11 @@ protected: virtual void FetchRows(const AddRowFunction& addRowFn) = 0; - static Value ZeroAccessor(const Object::Ptr&); - static Value OneAccessor(const Object::Ptr&); - static Value EmptyStringAccessor(const Object::Ptr&); - static Value EmptyArrayAccessor(const Object::Ptr&); - static Value EmptyDictionaryAccessor(const Object::Ptr&); + static Value ZeroAccessor(const Value&); + static Value OneAccessor(const Value&); + static Value EmptyStringAccessor(const Value&); + static Value EmptyArrayAccessor(const Value&); + static Value EmptyDictionaryAccessor(const Value&); private: std::map m_Columns;