Merge pull request #6999 from Icinga/bugfix/compiler-warnings

[icinga2] / test / base-timer.cpp

diff --git a/test/base-timer.cpp b/test/base-timer.cpp
index 2cbd519b2b7edbe717d76dc43c375b6cc2933540..db6922ebc46b56d2ca5f4a180bcaf2c692aea85e 100644 (file)
--- a/test/base-timer.cpp
+++ b/test/base-timer.cpp
@@ -1,21 +1,4 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * 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                *
- * 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 "base/timer.hpp"
 #include "base/utility.hpp"
@@ -39,16 +22,17 @@ BOOST_AUTO_TEST_CASE(interval)
        BOOST_CHECK(timer->GetInterval() == 1.5);
 }
 
-static void Callback(int *counter)
+int counter = 0;
+
+static void Callback(const Timer::Ptr&)
 {
-       (*counter)++;
+       counter++;
 }
 
 BOOST_AUTO_TEST_CASE(invoke)
 {
-       int counter;
        Timer::Ptr timer = new Timer();
-       timer->OnTimerExpired.connect(std::bind(&Callback, &counter));
+       timer->OnTimerExpired.connect(&Callback);
        timer->SetInterval(1);
 
        counter = 0;
@@ -61,9 +45,8 @@ BOOST_AUTO_TEST_CASE(invoke)
 
 BOOST_AUTO_TEST_CASE(scope)
 {
-       int counter;
        Timer::Ptr timer = new Timer();
-       timer->OnTimerExpired.connect(std::bind(&Callback, &counter));
+       timer->OnTimerExpired.connect(&Callback);
        timer->SetInterval(1);
 
        counter = 0;