Merge branch 'support/2.10'

[icinga2] / lib / livestatus / aggregator.cpp

diff --git a/lib/livestatus/aggregator.cpp b/lib/livestatus/aggregator.cpp
index c6021f1c68f7b4550725dcc81aa5b30670f4a8a3..a809b073f92d6b0747c398002aa598be7fc67523 100644 (file)
--- a/lib/livestatus/aggregator.cpp
+++ b/lib/livestatus/aggregator.cpp
@@ -1,35 +1,18 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012-2014 Icinga Development Team (http://www.icinga.org)    *
- *                                                                            *
- * This program is free software; you can redistribute it and/or              *
- * modify it under the terms of the GNU General Public License                *
- * as published by the Free Software Foundation; either version 2             *
- * of the License, or (at your option) any later version.                     *
- *                                                                            *
- * This program is distributed in the hope that it will be useful,            *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
- * GNU General Public License for more details.                               *
- *                                                                            *
- * You should have received a copy of the GNU General Public License          *
- * along with this program; if not, write to the Free Software Foundation     *
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
- ******************************************************************************/
+/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
 
 #include "livestatus/aggregator.hpp"
 
 using namespace icinga;
 
-Aggregator::Aggregator(void)
-{ }
-
 void Aggregator::SetFilter(const Filter::Ptr& filter)
 {
        m_Filter = filter;
 }
 
-Filter::Ptr Aggregator::GetFilter(void) const
+Filter::Ptr Aggregator::GetFilter() const
 {
        return m_Filter;
 }
+
+AggregatorState::~AggregatorState()
+{ }