diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-10-28 15:38:39 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-28 15:52:29 +0000 |
| commit | 47c6eef77378d96d0921c76ec14c338169f14dbe (patch) | |
| tree | 2671616ef7bc4a747be0a6f05c8a2655e30157fa /sal | |
| parent | 95e2a96f02512943eaa796facd238667de4bd964 (diff) | |
Related: fdo#69641 convert OSL_ASSERT into assert
Change-Id: I63c32289c7ac6a428c8c50e49650fbac98c8c5e3
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/rtl/ustring.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx index abf9db7b388b..e27a1dda96a7 100644 --- a/sal/rtl/ustring.cxx +++ b/sal/rtl/ustring.cxx @@ -980,11 +980,11 @@ sal_uInt32 SAL_CALL rtl_uString_iterateCodePoints( sal_Int32 n; sal_Unicode cu; sal_uInt32 cp; - OSL_ASSERT(string != NULL && indexUtf16 != NULL); + assert(string != NULL && indexUtf16 != NULL); n = *indexUtf16; - OSL_ASSERT(n >= 0 && n <= string->length); + assert(n >= 0 && n <= string->length); while (incrementCodePoints < 0) { - OSL_ASSERT(n > 0); + assert(n > 0); cu = string->buffer[--n]; if (SAL_RTL_IS_LOW_SURROGATE(cu) && n != 0 && SAL_RTL_IS_HIGH_SURROGATE(string->buffer[n - 1])) @@ -993,7 +993,7 @@ sal_uInt32 SAL_CALL rtl_uString_iterateCodePoints( } ++incrementCodePoints; } - OSL_ASSERT(n >= 0 && n < string->length); + assert(n >= 0 && n < string->length); cu = string->buffer[n]; if (SAL_RTL_IS_HIGH_SURROGATE(cu) && string->length - n >= 2 && SAL_RTL_IS_LOW_SURROGATE(string->buffer[n + 1])) @@ -1003,7 +1003,7 @@ sal_uInt32 SAL_CALL rtl_uString_iterateCodePoints( cp = cu; } while (incrementCodePoints > 0) { - OSL_ASSERT(n < string->length); + assert(n < string->length); cu = string->buffer[n++]; if (SAL_RTL_IS_HIGH_SURROGATE(cu) && n != string->length && SAL_RTL_IS_LOW_SURROGATE(string->buffer[n])) @@ -1012,7 +1012,7 @@ sal_uInt32 SAL_CALL rtl_uString_iterateCodePoints( } --incrementCodePoints; } - OSL_ASSERT(n >= 0 && n <= string->length); + assert(n >= 0 && n <= string->length); *indexUtf16 = n; return cp; } |