Merge pull request #7204 from episodeiv/master

[icinga2] / lib / livestatus / table.cpp

diff --git a/lib/livestatus/table.cpp b/lib/livestatus/table.cpp
index 62302e8fbdab4e27062fb6dd88265ec3bb425c10..ac8d1745cff57eaada5b03b06f7b7050743db2a9 100644 (file)
--- a/lib/livestatus/table.cpp
+++ b/lib/livestatus/table.cpp
@@ -1,21 +1,4 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012-2016 Icinga Development Team (https://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/table.hpp"
 #include "livestatus/statustable.hpp"
@@ -37,13 +20,11 @@
 #include "base/array.hpp"
 #include "base/dictionary.hpp"
 #include <boost/algorithm/string/case_conv.hpp>
-#include <boost/tuple/tuple.hpp>
-#include <boost/bind.hpp>
 
 using namespace icinga;
 
 Table::Table(LivestatusGroupByType type)
-    : m_GroupByType(type), m_GroupByObject(Empty)
+       : m_GroupByType(type), m_GroupByObject(Empty)
 { }
 
 Table::Ptr Table::GetByName(const String& name, const String& compat_log_path, const unsigned long& from, const unsigned long& until)
@@ -85,7 +66,7 @@ Table::Ptr Table::GetByName(const String& name, const String& compat_log_path, c
        else if (name == "zones")
                return new ZonesTable();
 
-       return Table::Ptr();
+       return nullptr;
 }
 
 void Table::AddColumn(const String& name, const Column& column)
@@ -114,7 +95,7 @@ Column Table::GetColumn(const String& name) const
        return it->second;
 }
 
-std::vector<String> Table::GetColumnNames(void) const
+std::vector<String> Table::GetColumnNames() const
 {
        std::vector<String> names;
 
@@ -129,7 +110,7 @@ std::vector<LivestatusRowValue> Table::FilterRows(const Filter::Ptr& filter, int
 {
        std::vector<LivestatusRowValue> rs;
 
-       FetchRows(boost::bind(&Table::FilteredAddRow, this, boost::ref(rs), filter, limit, _1, _2, _3));
+       FetchRows(std::bind(&Table::FilteredAddRow, this, std::ref(rs), filter, limit, _1, _2, _3));
 
        return rs;
 }
@@ -145,8 +126,7 @@ bool Table::FilteredAddRow(std::vector<LivestatusRowValue>& rs, const Filter::Pt
                rval.GroupByType = groupByType;
                rval.GroupByObject = groupByObject;
 
-               rs.push_back(rval);
-
+               rs.emplace_back(std::move(rval));
        }
 
        return true;
@@ -177,7 +157,7 @@ Value Table::EmptyDictionaryAccessor(const Value&)
        return new Dictionary();
 }
 
-LivestatusGroupByType Table::GetGroupByType(void) const
+LivestatusGroupByType Table::GetGroupByType() const
 {
        return m_GroupByType;
 }