diff options
| author | Timothy Markle <tmarkle7@gmail.com> | 2014-01-31 21:17:10 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-05 12:39:03 +0000 |
| commit | 995073b08e69f6616479f5dd4d4094d96f893207 (patch) | |
| tree | 9500deea378fbd637980ca6dcd6c27dd69b289df | |
| parent | 1b5beba7c168fc8c20c8e4326b863171cf9662a7 (diff) | |
fdo#43157 - Clean up OSL_ASSERT
Changed OSL_ASSERT to SAL_WARN_IF
Change-Id: I6f81a265aefe769e1449b1f10c796bf3aa1d0f1c
| -rw-r--r-- | cppu/source/UnsafeBridge/UnsafeBridge.cxx | 8 | ||||
| -rw-r--r-- | include/sal/log-areas.dox | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx index 7cd18fa8eacb..dcb3fe7f76ad 100644 --- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx +++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx @@ -71,7 +71,7 @@ UnsafeBridge::~UnsafeBridge(void) { LOG_LIFECYCLE_UnsafeBridge_emit(fprintf(stderr, "LIFE: %s -> %p\n", "UnsafeBridge::~UnsafeBridge(void)", this)); - OSL_ASSERT(m_count >= 0); + SAL_WARN_IF(m_count < 0, "cppu.unsafebridge", "m_count is less than 0"); } void UnsafeBridge::v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) @@ -83,7 +83,7 @@ void UnsafeBridge::v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) void UnsafeBridge::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam) { - OSL_ASSERT(m_count > 0); + SAL_WARN_IF(m_count <= 0, "cppu.unsafebridge", "m_count is less than or equal to 0"); -- m_count; pCallee(pParam); @@ -97,7 +97,7 @@ void UnsafeBridge::v_enter(void) { m_mutex.acquire(); - OSL_ASSERT(m_count >= 0); + SAL_WARN_IF(m_count < 0, "cppu.unsafebridge", "m_count is less than 0"); if (m_count == 0) m_threadId = osl::Thread::getCurrentIdentifier(); @@ -107,7 +107,7 @@ void UnsafeBridge::v_enter(void) void UnsafeBridge::v_leave(void) { - OSL_ASSERT(m_count > 0); + SAL_WARN_IF(m_count <= 0, "cppu.unsafebridge", "m_count is less than or equal to 0"); -- m_count; if (!m_count) diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index fa8cd4538c40..5ff8c1852420 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -80,6 +80,11 @@ certain functionality. @li @c comphelper @li @c comphelper.container +@section cppu + +@li @c cppu +@li @c cppu.unsafebridge + @section cppuhelper @li @c cppuhelper @@ -437,7 +442,6 @@ certain functionality. @li @c configmgr @li @c cppcanvas @li @c cppcanvas.emf -@li @c cppu @li @c helpcompiler @li @c linguistic @li @c oox |