diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-09-30 21:13:27 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-09-30 21:16:21 +0200 |
| commit | 592b43acb6b88bf2b138692fd6078f84d709f457 (patch) | |
| tree | 44d6f4524c9139b379ba8efb57812a54ffb2d957 /bridges | |
| parent | 358ca9eaa3d85236047a7a2781e38f57209c2858 (diff) | |
bridges: fix build with --enable-assert-always-abort
Change-Id: I6079481046ca3f7d66975d41fccc15b862a3223b
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/msvc_win32_intel/except.cxx | 5 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx index 6aaf8c2c8f4f..6c556cc2a072 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx @@ -188,10 +188,9 @@ inline void * ObjectFunction::operator new ( size_t nSize ) if (pMem != 0) { DWORD old_protect; -#if OSL_DEBUG_LEVEL > 0 BOOL success = -#endif - VirtualProtect( pMem, nSize, PAGE_EXECUTE_READWRITE, &old_protect ); + VirtualProtect(pMem, nSize, PAGE_EXECUTE_READWRITE, &old_protect); + (void) success; assert(success && "VirtualProtect() failed!"); } return pMem; diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx index 3a43ea347974..9dc7b3829c21 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -655,10 +655,9 @@ RaiseInfo::RaiseInfo(typelib_TypeDescription * pTD)throw () & ~static_cast<sal_uInt64>(ExceptionInfos::allocationGranularity - 1); DWORD old_protect; -#if OSL_DEBUG_LEVEL > 0 BOOL success = -#endif VirtualProtect(pCode, codeSize, PAGE_EXECUTE_READWRITE, &old_protect); + (void) success; assert(success && "VirtualProtect() failed!"); ::typelib_typedescription_acquire(pTD); |