livestatus: add parentObjectAccessor to function prototypes

comments and downtimes where missing, even if unused.

diff --git a/components/livestatus/commentstable.cpp b/components/livestatus/commentstable.cpp
index 088f926331d07f8a507365846f38c51109028e62..f820de2864cb7b2638cb6bdaed731aa0712d53eb 100644 (file)
--- a/components/livestatus/commentstable.cpp
+++ b/components/livestatus/commentstable.cpp
@@ -48,7 +48,7 @@ void CommentsTable::AddColumns(Table *table, const String& prefix,
        table->AddColumn(prefix + "expires", Column(&CommentsTable::ExpiresAccessor, objectAccessor));
        table->AddColumn(prefix + "expire_time", Column(&CommentsTable::ExpireTimeAccessor, objectAccessor));
 
-       ServicesTable::AddColumns(table, "service_", &CommentsTable::ServiceAccessor);
+       ServicesTable::AddColumns(table, "service_", boost::bind(&CommentsTable::ServiceAccessor, _1, objectAccessor));
 }
 
 String CommentsTable::GetName(void) const
@@ -75,7 +75,7 @@ void CommentsTable::FetchRows(const AddRowFunction& addRowFn)
        }
 }
 
-Object::Ptr CommentsTable::ServiceAccessor(const Value& row)
+Object::Ptr CommentsTable::ServiceAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor)
 {
        return Service::GetOwnerByCommentID(row);
 }

diff --git a/components/livestatus/commentstable.h b/components/livestatus/commentstable.h
index 8d7ea186392d8502eb8d675060adc0bbee43d848..2e63c7860cfa84a2ae3871b753fada6fd93c2bb6 100644 (file)
--- a/components/livestatus/commentstable.h
+++ b/components/livestatus/commentstable.h
@@ -46,7 +46,7 @@ protected:
        virtual void FetchRows(const AddRowFunction& addRowFn);
 
 private:
-       static Object::Ptr ServiceAccessor(const Value& row);
+       static Object::Ptr ServiceAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor);
 
        static Value AuthorAccessor(const Value& row);
        static Value CommentAccessor(const Value& row);

diff --git a/components/livestatus/downtimestable.cpp b/components/livestatus/downtimestable.cpp
index 880798de98efdf1c080a1814f68f339de219a690..0911341bcf140f33a09e75e82d8c3c5d8ceba307 100644 (file)
--- a/components/livestatus/downtimestable.cpp
+++ b/components/livestatus/downtimestable.cpp
@@ -48,7 +48,7 @@ void DowntimesTable::AddColumns(Table *table, const String& prefix,
        table->AddColumn(prefix + "duration", Column(&DowntimesTable::DurationAccessor, objectAccessor));
        table->AddColumn(prefix + "triggered_by", Column(&DowntimesTable::TriggeredByAccessor, objectAccessor));
 
-       ServicesTable::AddColumns(table, "service_", &DowntimesTable::ServiceAccessor);
+       ServicesTable::AddColumns(table, "service_", boost::bind(&DowntimesTable::ServiceAccessor, _1, objectAccessor));
 }
 
 String DowntimesTable::GetName(void) const
@@ -75,7 +75,7 @@ void DowntimesTable::FetchRows(const AddRowFunction& addRowFn)
        }
 }
 
-Object::Ptr DowntimesTable::ServiceAccessor(const Value& row)
+Object::Ptr DowntimesTable::ServiceAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor)
 {
        return Service::GetOwnerByDowntimeID(row);
 }

diff --git a/components/livestatus/downtimestable.h b/components/livestatus/downtimestable.h
index 2e08bdca9d9863b2ef8f7f31a4a1e6f76bba5777..3dd5bc218bc8d06d7bd6711e329c3da061faff24 100644 (file)
--- a/components/livestatus/downtimestable.h
+++ b/components/livestatus/downtimestable.h
@@ -46,7 +46,7 @@ protected:
        virtual void FetchRows(const AddRowFunction& addRowFn);
 
 private:
-       static Object::Ptr ServiceAccessor(const Value& row);
+       static Object::Ptr ServiceAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor);
 
        static Value AuthorAccessor(const Value& row);
        static Value CommentAccessor(const Value& row);