Move CompatUtility::GetCheckableInCheckPeriod() into Livestatus feature

[icinga2] / lib / livestatus / combinerfilter.hpp

diff --git a/lib/livestatus/combinerfilter.hpp b/lib/livestatus/combinerfilter.hpp
index ecfefee6c858832c695cc7e7d4477edef7d8c81c..56b7e9b90cc2518f13c623f4437a8bc36244ad9c 100644 (file)
--- a/lib/livestatus/combinerfilter.hpp
+++ b/lib/livestatus/combinerfilter.hpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2014 Icinga Development Team (http://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                *
@@ -33,14 +33,14 @@ namespace icinga
 class CombinerFilter : public Filter
 {
 public:
-       DECLARE_OBJECT(CombinerFilter);
-
-       CombinerFilter(void);
+       DECLARE_PTR_TYPEDEFS(CombinerFilter);
 
        void AddSubFilter(const Filter::Ptr& filter);
 
 protected:
        std::vector<Filter::Ptr> m_Filters;
+
+       CombinerFilter() = default;
 };
 
 }