From c577b04ccc6d9dd2efc6cbed7892b094f8cd9a9d Mon Sep 17 00:00:00 2001 From: jules Date: Fri, 14 Mar 2014 17:54:17 +0000 Subject: [PATCH] Removed some Timer debugging code that wasn't really very useful. --- modules/juce_events/timers/juce_Timer.cpp | 26 ----------------------- 1 file changed, 26 deletions(-) diff --git a/modules/juce_events/timers/juce_Timer.cpp b/modules/juce_events/timers/juce_Timer.cpp index e0bbadb024..6b7343a559 100644 --- a/modules/juce_events/timers/juce_Timer.cpp +++ b/modules/juce_events/timers/juce_Timer.cpp @@ -295,20 +295,12 @@ Timer::TimerThread* Timer::TimerThread::instance = nullptr; Timer::TimerThread::LockType Timer::TimerThread::lock; //============================================================================== -#if JUCE_DEBUG -static SortedSet activeTimers; -#endif - Timer::Timer() noexcept : countdownMs (0), periodMs (0), previous (nullptr), next (nullptr) { - #if JUCE_DEBUG - const TimerThread::LockType::ScopedLockType sl (TimerThread::lock); - activeTimers.add (this); - #endif } Timer::Timer (const Timer&) noexcept @@ -317,30 +309,17 @@ Timer::Timer (const Timer&) noexcept previous (nullptr), next (nullptr) { - #if JUCE_DEBUG - const TimerThread::LockType::ScopedLockType sl (TimerThread::lock); - activeTimers.add (this); - #endif } Timer::~Timer() { stopTimer(); - - #if JUCE_DEBUG - activeTimers.removeValue (this); - #endif } void Timer::startTimer (const int interval) noexcept { const TimerThread::LockType::ScopedLockType sl (TimerThread::lock); - #if JUCE_DEBUG - // this isn't a valid object! Your timer might be a dangling pointer or something.. - jassert (activeTimers.contains (this)); - #endif - if (periodMs == 0) { countdownMs = interval; @@ -357,11 +336,6 @@ void Timer::stopTimer() noexcept { const TimerThread::LockType::ScopedLockType sl (TimerThread::lock); - #if JUCE_DEBUG - // this isn't a valid object! Your timer might be a dangling pointer or something.. - jassert (activeTimers.contains (this)); - #endif - if (periodMs > 0) { TimerThread::remove (this);