tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/livestatus-comments-5005' into next 

Fixes #5005
This commit is contained in:
Michael Friedrich 2013-11-05 13:41:04 +01:00
parent 2617521ce3 97a2771a08
commit 6f038c1930
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/livestatus/table.cpp
View File

@ -121,27 +121,27 @@ void Table::FilteredAddRow(std::vector<Value>& 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<Array>();
}
Value Table::EmptyDictionaryAccessor(const Object::Ptr&)
Value Table::EmptyDictionaryAccessor(const Value&)
{
return boost::make_shared<Dictionary>();
}

10
components/livestatus/table.h
View File

@ -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<String, Column> m_Columns;