bridges/source/cpp_uno/msvc_win32_intel/except.cxx | 5 ++--- bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-)
New commits: commit 592b43acb6b88bf2b138692fd6078f84d709f457 Author: Michael Stahl <[email protected]> Date: Wed Sep 30 21:13:27 2015 +0200 bridges: fix build with --enable-assert-always-abort Change-Id: I6079481046ca3f7d66975d41fccc15b862a3223b diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx index 6aaf8c2..6c556cc 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 3a43ea3..9dc7b38 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); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
