diff --git a/modules/juce_core/containers/juce_ListenerList.cpp b/modules/juce_core/containers/juce_ListenerList.cpp index 01ea6dc171..455bd72eff 100644 --- a/modules/juce_core/containers/juce_ListenerList.cpp +++ b/modules/juce_core/containers/juce_ListenerList.cpp @@ -75,23 +75,15 @@ class ListenerListTests : public UnitTest public: ListenerListTests() : UnitTest ("ListenerList") {} - template - void callHelper (std::vector& expectedCounterValues, T v) + template + void callHelper (std::vector& expectedCounterValues) { - counter = 0; - listeners.call (&ListenerBase::f, v); - expect (counter == expectedCounterValues[1]); - counter = 0; listeners.call (&ListenerBase::f); expect (counter == expectedCounterValues[0]); ListenerList::DummyBailOutChecker boc; - counter = 0; - listeners.callChecked (boc, &ListenerBase::f, v); - expect (counter == expectedCounterValues[1]); - counter = 0; listeners.callChecked (boc, &ListenerBase::f); expect (counter == expectedCounterValues[0]); @@ -114,24 +106,16 @@ public: callHelper (expectedCounterValues, args...); } - template + template void callExcludingHelper (ListenerBase& listenerToExclude, - std::vector& expectedCounterValues, T v) + std::vector& expectedCounterValues) { - counter = 0; - listeners.callExcluding (listenerToExclude, &ListenerBase::f, v); - expect (counter == expectedCounterValues[1]); - counter = 0; listeners.callExcluding (listenerToExclude, &ListenerBase::f); expect (counter == expectedCounterValues[0]); ListenerList::DummyBailOutChecker boc; - counter = 0; - listeners.callCheckedExcluding (listenerToExclude, boc, &ListenerBase::f, v); - expect (counter == expectedCounterValues[1]); - counter = 0; listeners.callCheckedExcluding (listenerToExclude, boc, &ListenerBase::f); expect (counter == expectedCounterValues[0]);