diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
| commit | 97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch) | |
| tree | 7974a8b9423c56982646366b0859dfb2a1a88d50 /salhelper | |
| parent | d0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff) | |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'salhelper')
| -rw-r--r-- | salhelper/source/simplereferenceobject.cxx | 3 | ||||
| -rw-r--r-- | salhelper/source/timer.cxx | 16 |
2 files changed, 9 insertions, 10 deletions
diff --git a/salhelper/source/simplereferenceobject.cxx b/salhelper/source/simplereferenceobject.cxx index 8e5fdfa18d2c..72e31c429cdc 100644 --- a/salhelper/source/simplereferenceobject.cxx +++ b/salhelper/source/simplereferenceobject.cxx @@ -21,13 +21,12 @@ #include "osl/diagnose.h" #include <new> -#include <cassert> using salhelper::SimpleReferenceObject; SimpleReferenceObject::~SimpleReferenceObject() { - assert(m_nCount == 0); + OSL_ASSERT(m_nCount == 0); } void * SimpleReferenceObject::operator new(std::size_t nSize) diff --git a/salhelper/source/timer.cxx b/salhelper/source/timer.cxx index 4d09ffe9644a..c79f1fc03588 100644 --- a/salhelper/source/timer.cxx +++ b/salhelper/source/timer.cxx @@ -116,7 +116,7 @@ void Timer::start() TimerManager *pManager = TimerManager::getTimerManager(); - assert(pManager); + OSL_ASSERT(pManager); if ( pManager != nullptr ) { @@ -129,7 +129,7 @@ void Timer::stop() { TimerManager *pManager = TimerManager::getTimerManager(); - assert(pManager); + OSL_ASSERT(pManager); if ( pManager != nullptr ) { @@ -141,7 +141,7 @@ sal_Bool Timer::isTicking() const { TimerManager *pManager = TimerManager::getTimerManager(); - assert(pManager); + OSL_ASSERT(pManager); if (pManager) return pManager->lookupTimer(this); @@ -161,7 +161,7 @@ sal_Bool Timer::isExpired() const sal_Bool Timer::expiresBefore(const Timer* pTimer) const { - assert(pTimer); + OSL_ASSERT(pTimer); if ( pTimer != nullptr ) { @@ -245,7 +245,7 @@ TimerManager::TimerManager() { osl::MutexGuard Guard(theTimerManagerMutex::get()); - assert(m_pManager == nullptr); + OSL_ASSERT(m_pManager == nullptr); m_pManager = this; @@ -282,7 +282,7 @@ TimerManager* TimerManager::getTimerManager() void TimerManager::registerTimer(Timer* pTimer) { - assert(pTimer); + OSL_ASSERT(pTimer); if ( pTimer == nullptr ) { @@ -321,7 +321,7 @@ void TimerManager::registerTimer(Timer* pTimer) void TimerManager::unregisterTimer(Timer* pTimer) { - assert(pTimer); + OSL_ASSERT(pTimer); if ( pTimer == nullptr ) { @@ -347,7 +347,7 @@ void TimerManager::unregisterTimer(Timer* pTimer) bool TimerManager::lookupTimer(const Timer* pTimer) { - assert(pTimer); + OSL_ASSERT(pTimer); if ( pTimer == nullptr ) { |