summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 17:03:35 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 17:03:35 +1000
commit97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch)
tree7974a8b9423c56982646366b0859dfb2a1a88d50 /include
parentd0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff)
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'include')
-rw-r--r--include/canvas/base/spritecanvasbase.hxx8
-rw-r--r--include/salhelper/refobj.hxx2
2 files changed, 5 insertions, 5 deletions
diff --git a/include/canvas/base/spritecanvasbase.hxx b/include/canvas/base/spritecanvasbase.hxx
index bd229af5288e..044a279c061e 100644
--- a/include/canvas/base/spritecanvasbase.hxx
+++ b/include/canvas/base/spritecanvasbase.hxx
@@ -139,7 +139,7 @@ namespace canvas
// SpriteSurface
virtual void showSprite( const Sprite::Reference& rSprite ) override
{
- assert( rSprite.is() );
+ OSL_ASSERT( rSprite.is() );
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
@@ -148,7 +148,7 @@ namespace canvas
virtual void hideSprite( const Sprite::Reference& rSprite ) override
{
- assert( rSprite.is() );
+ OSL_ASSERT( rSprite.is() );
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
@@ -160,7 +160,7 @@ namespace canvas
const ::basegfx::B2DPoint& rNewPos,
const ::basegfx::B2DVector& rSpriteSize ) override
{
- assert( rSprite.is() );
+ OSL_ASSERT( rSprite.is() );
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
@@ -171,7 +171,7 @@ namespace canvas
const ::basegfx::B2DPoint& rPos,
const ::basegfx::B2DRange& rUpdateArea ) override
{
- assert( rSprite.is() );
+ OSL_ASSERT( rSprite.is() );
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
diff --git a/include/salhelper/refobj.hxx b/include/salhelper/refobj.hxx
index 740ac57e19c3..bb2f31bcd78f 100644
--- a/include/salhelper/refobj.hxx
+++ b/include/salhelper/refobj.hxx
@@ -85,7 +85,7 @@ protected:
*/
virtual ~ReferenceObject()
{
- assert(m_nReferenceCount == 0);
+ OSL_ASSERT(m_nReferenceCount == 0);
}
};