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/mingw_intel/callvirtualmethod.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/mingw_intel/callvirtualmethod.cxx')
| -rw-r--r-- | bridges/source/cpp_uno/mingw_intel/callvirtualmethod.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bridges/source/cpp_uno/mingw_intel/callvirtualmethod.cxx b/bridges/source/cpp_uno/mingw_intel/callvirtualmethod.cxx index ef86ad79e722..9b826bfc4abb 100644 --- a/bridges/source/cpp_uno/mingw_intel/callvirtualmethod.cxx +++ b/bridges/source/cpp_uno/mingw_intel/callvirtualmethod.cxx @@ -20,7 +20,6 @@ #include "sal/config.h" #include "cppu/macros.hxx" -#include "osl/diagnose.h" #include "sal/types.h" #include "typelib/typeclass.h" #include "typelib/typedescription.h" @@ -49,9 +48,9 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod( // parameter list is mixed list of * and values // reference parameters are pointers - OSL_ENSURE( pStackLongs && pAdjustedThisPtr, "### null ptr!" ); - OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" ); - OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" ); + assert(pStackLongs && pAdjustedThisPtr); + static_assert( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!"); + assert(nStackLongs && pStackLongs && "### no stack in callVirtualMethod !"); // never called if (! pAdjustedThisPtr) CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something |