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 /slideshow/source/engine/animationnodes/basecontainernode.cxx | |
| parent | tdf#43157: convert sd module away from OSL_ASSERT to assert (diff) | |
| download | core-97eb00c75e173d4c8d0b483a7941ad3d2f23783e.tar.gz core-97eb00c75e173d4c8d0b483a7941ad3d2f23783e.zip | |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'slideshow/source/engine/animationnodes/basecontainernode.cxx')
| -rw-r--r-- | slideshow/source/engine/animationnodes/basecontainernode.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx index d293a2ca4a79..83f72a96b457 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.cxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx @@ -119,10 +119,10 @@ bool BaseContainerNode::isChildNode( AnimationNodeSharedPtr const& pNode ) const bool BaseContainerNode::notifyDeactivatedChild( AnimationNodeSharedPtr const& pChildNode ) { - assert( pChildNode->getState() == FROZEN || + OSL_ASSERT( pChildNode->getState() == FROZEN || pChildNode->getState() == ENDED ); // early exit on invalid nodes - assert( getState() != INVALID ); + OSL_ASSERT( getState() != INVALID ); if( getState() == INVALID ) return false; @@ -132,7 +132,7 @@ bool BaseContainerNode::notifyDeactivatedChild( } std::size_t const nSize = maChildren.size(); - assert( mnFinishedChildren < nSize ); + OSL_ASSERT( mnFinishedChildren < nSize ); ++mnFinishedChildren; bool bFinished = (mnFinishedChildren >= nSize); |