diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-11-21 17:30:53 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-21 17:32:26 +0100 |
| commit | 1276076ac8fcc84df64050f8aa194fa75386a0ea (patch) | |
| tree | 258d77877c052464ff113f56355bbcc5d16e80a5 /bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx | |
| parent | 329742e6c9da7cd7848d92a6846e3d1249d8d9b4 (diff) | |
ibridges: convert all legacy osl/diagnose.h assertions in source/cppu_uno
Change-Id: I4e78fac76b6bb4923e3b680d910afe5bb9640c33
Diffstat (limited to 'bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx')
| -rw-r--r-- | bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx index b2d17fd705d7..c692b33d4f9e 100644 --- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx +++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx @@ -25,7 +25,6 @@ #include "bridges/cpp_uno/shared/vtablefactory.hxx" #include "com/sun/star/uno/XInterface.hpp" -#include "osl/diagnose.h" #include "osl/getglobalmutex.hxx" #include "osl/interlck.h" #include "osl/mutex.hxx" @@ -80,7 +79,7 @@ void freeCppInterfaceProxy(uno_ExtEnvironment * pEnv, void * pInterface) CppInterfaceProxy * pThis = CppInterfaceProxy::castInterfaceToProxy( pInterface); if (pEnv != pThis->pBridge->getCppEnv()) { - OSL_ASSERT(false); + assert(false); } (*pThis->pBridge->getUnoEnv()->revokeInterface)( @@ -129,7 +128,7 @@ void CppInterfaceProxy::acquireProxy() (*pBridge->getCppEnv()->registerProxyInterface)( pBridge->getCppEnv(), &pThis, freeCppInterfaceProxy, oid.pData, pTypeDescr ); - OSL_ASSERT( pThis == castProxyToInterface( this ) ); + assert(pThis == castProxyToInterface(this)); } } |