diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-01-14 19:11:13 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-01-14 19:11:13 +0100 |
| commit | ac27218d0d423c99fed81f7726ef0bb10d67c14e (patch) | |
| tree | a8046e11a6fad9af2487ec0c4c26969be1316f25 /io/source | |
| parent | 98ff20e30873c73ca8ba3995fd0c959a1b28fc78 (diff) | |
| parent | 6e8628fb7374b7d19e15f03e63f8ad221ca25f1e (diff) | |
rebase to DEV300_m69
Diffstat (limited to 'io/source')
| -rw-r--r-- | io/source/stm/omark.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index 69ccf08fce6a..29d326170ff1 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -49,12 +49,6 @@ #include <osl/mutex.hxx> #include <rtl/ustrbuf.hxx> -#if OSL_DEBUG_LEVEL == 0 -# ifndef NDEBUG -# define NDEBUG -# endif -#endif -#include <assert.h> #include <string.h> @@ -632,7 +626,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 ); - assert( aData.getLength() == nRead ); + OSL_ASSERT( aData.getLength() == nRead ); try { @@ -650,7 +644,7 @@ sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 } } - assert( m_pBuffer->getSize() - m_nCurrentPos >= nBytesToRead ); + OSL_ASSERT( m_pBuffer->getSize() - m_nCurrentPos >= nBytesToRead ); m_pBuffer->readAt( m_nCurrentPos , aData , nBytesToRead ); |