From 9a274915a16eea5e3ce51a27b1a8741ac5e785b8 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Sun, 7 May 2017 08:11:12 +1000 Subject: tdf#43157: convert cppuhelper and io from OSL_ASSERT to assert Change-Id: I56d49e1ce9f1c070fedcabb8f1637d17dee1083b --- io/source/acceptor/acc_pipe.cxx | 2 +- io/source/stm/omark.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'io/source') diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx index b1395946d936..d01daeadf931 100644 --- a/io/source/acceptor/acc_pipe.cxx +++ b/io/source/acceptor/acc_pipe.cxx @@ -77,7 +77,7 @@ namespace io_acceptor aReadBytes.realloc( nBytesToRead ); } sal_Int32 n = m_pipe.read( aReadBytes.getArray(), nBytesToRead ); - OSL_ASSERT( n >= 0 && n <= aReadBytes.getLength() ); + assert( n >= 0 && n <= aReadBytes.getLength() ); if( n < aReadBytes.getLength() ) { aReadBytes.realloc( n ); diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index 9053ada96698..e47a4f342e31 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -497,7 +497,7 @@ sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 sal_Int32 nToRead = nBytesToRead - ( m_pBuffer->getSize() - m_nCurrentPos ); nRead = m_input->readBytes( aData , nToRead ); - OSL_ASSERT( aData.getLength() == nRead ); + assert( aData.getLength() == nRead ); m_pBuffer->writeAt( m_pBuffer->getSize() , aData ); @@ -506,7 +506,7 @@ sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 } } - OSL_ASSERT( m_pBuffer->getSize() - m_nCurrentPos >= nBytesToRead ); + assert( m_pBuffer->getSize() - m_nCurrentPos >= nBytesToRead ); m_pBuffer->readAt( m_nCurrentPos , aData , nBytesToRead ); -- cgit