tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6760 from Icinga/bugfix/armhf-stretch 

armhf: Apply workaround for timer tests with std::bind callbacks
This commit is contained in:
Michael Friedrich 2018-11-09 11:50:06 +01:00 committed by GitHub
parent ec169de5c4 2991993f6b
commit bd1cfc7bf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/base-timer.cpp
View File

@ -39,16 +39,17 @@ BOOST_AUTO_TEST_CASE(interval)
BOOST_CHECK(timer->GetInterval() == 1.5); 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) BOOST_AUTO_TEST_CASE(invoke)
{ {
int counter;
Timer::Ptr timer = new Timer(); Timer::Ptr timer = new Timer();
timer->OnTimerExpired.connect(std::bind(&Callback, &counter)); timer->OnTimerExpired.connect(&Callback);
timer->SetInterval(1); timer->SetInterval(1);
counter = 0; counter = 0;
@ -61,9 +62,8 @@ BOOST_AUTO_TEST_CASE(invoke)
BOOST_AUTO_TEST_CASE(scope) BOOST_AUTO_TEST_CASE(scope)
{ {
int counter;
Timer::Ptr timer = new Timer(); Timer::Ptr timer = new Timer();
timer->OnTimerExpired.connect(std::bind(&Callback, &counter)); timer->OnTimerExpired.connect(&Callback);
timer->SetInterval(1); timer->SetInterval(1);
counter = 0; counter = 0;