diff options
Diffstat (limited to 'bridges/source/cpp_uno/msvc_win32_intel/except.cxx')
| -rw-r--r-- | bridges/source/cpp_uno/msvc_win32_intel/except.cxx | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx index bd805a419cac..3fa94744d296 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx @@ -484,21 +484,7 @@ int msci_filterCppException( if (rethrow && pRecord == pPointers->ExceptionRecord) { - pRecord = *reinterpret_cast< EXCEPTION_RECORD ** >( -#if _MSC_VER >= 1900 // VC 2015 (and later?) - __current_exception() -#else - // hack to get msvcrt internal _curexception field: - reinterpret_cast< char * >( __pxcptinfoptrs() ) + - // as long as we don't demand msvcr source as build prerequisite - // (->platform sdk), we have to code those offsets here. - // - // crt\src\mtdll.h: - // offsetof (_tiddata, _curexception) - - // offsetof (_tiddata, _tpxcptinfoptrs): - 0x28 // msvcr80.dll (and later?) -#endif - ); + pRecord = *reinterpret_cast< EXCEPTION_RECORD ** >(__current_exception()); } // rethrow: handle only C++ exceptions: if (pRecord == 0 || pRecord->ExceptionCode != MSVC_ExceptionCode) |