Move CompatUtility::GetCheckableInCheckPeriod() into Livestatus feature

[icinga2] / lib / livestatus / table.hpp

diff --git a/lib/livestatus/table.hpp b/lib/livestatus/table.hpp
index daaf54fe3d4fecbd94532854f24d6d1af83de728..5a3094e05e83423b395fac4a38e7c4e2bf674952 100644 (file)
--- a/lib/livestatus/table.hpp
+++ b/lib/livestatus/table.hpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)  *
+ * Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)  *
  *                                                                            *
  * This program is free software; you can redistribute it and/or              *
  * modify it under the terms of the GNU General Public License                *
@@ -35,31 +35,30 @@ struct LivestatusRowValue {
        Value GroupByObject;
 };
 
-
-typedef boost::function<bool (const Value&, LivestatusGroupByType, const Object::Ptr&)> AddRowFunction;
+typedef std::function<bool (const Value&, LivestatusGroupByType, const Object::Ptr&)> AddRowFunction;
 
 class Filter;
 
 /**
  * @ingroup livestatus
  */
-class I2_LIVESTATUS_API Table : public Object
+class Table : public Object
 {
 public:
        DECLARE_PTR_TYPEDEFS(Table);
 
        static Table::Ptr GetByName(const String& name, const String& compat_log_path = "", const unsigned long& from = 0, const unsigned long& until = 0);
 
-       virtual String GetName(void) const = 0;
-       virtual String GetPrefix(void) const = 0;
+       virtual String GetName() const = 0;
+       virtual String GetPrefix() const = 0;
 
        std::vector<LivestatusRowValue> FilterRows(const intrusive_ptr<Filter>& filter, int limit = -1);
 
        void AddColumn(const String& name, const Column& column);
        Column GetColumn(const String& name) const;
-       std::vector<String> GetColumnNames(void) const;
+       std::vector<String> GetColumnNames() const;
 
-       virtual LivestatusGroupByType GetGroupByType(void) const;
+       LivestatusGroupByType GetGroupByType() const;
 
 protected:
        Table(LivestatusGroupByType type = LivestatusGroupByNone);