From 5ace3f3b4f2f916d8b2acab1b5cc0fe2a5a19dee Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 1 Jul 2014 09:59:26 +0100
Subject: clang scan-build: various warnings

Change-Id: I4bdfb074b3cf6fcb49765322308dfa4b9ed67713
---
 cppu/source/uno/data.cxx  | 2 +-
 cppu/source/uno/lbenv.cxx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'cppu/source')

diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index 3ef7acf9df59..7a7228737a75 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -60,7 +60,7 @@ void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * p
                 * typelib_static_type_getByTypeClass( typelib_TypeClass_INTERFACE );
             typelib_InterfaceTypeDescription * pTXInterfaceDescr = 0;
             TYPELIB_DANGER_GET( (typelib_TypeDescription **) &pTXInterfaceDescr, type_XInterface );
-            OSL_ASSERT( pTXInterfaceDescr->ppAllMembers );
+            assert(pTXInterfaceDescr->ppAllMembers);
             typelib_typedescriptionreference_getDescription(
                 &g_pQITD, pTXInterfaceDescr->ppAllMembers[ 0 ] );
             TYPELIB_DANGER_RELEASE( (typelib_TypeDescription *) pTXInterfaceDescr );
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index f382c0dc80a0..b2828209d45d 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -864,7 +864,7 @@ extern "C"
 static void SAL_CALL unoenv_computeObjectIdentifier(
     uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface )
 {
-    OSL_ENSURE( pEnv && ppOId && pInterface, "### null ptr!" );
+    assert(pEnv && ppOId && pInterface && "### null ptr!");
     if (*ppOId)
     {
         ::rtl_uString_release( *ppOId );
-- 
cgit