diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-27 14:41:16 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-28 20:53:40 +0200 |
| commit | a3ce60eb3c8bb5c69ab41556398efa8316286477 (patch) | |
| tree | a9600fdf96ab53a1aef150fd9c4a1e8c23b9eb90 /bridges/source/cpp_uno/msvc_win32_intel | |
| parent | abfe16cec61eae33c64cb1901f0fc740b0466f60 (diff) | |
We only support MSVC 2008 (_MSC_VER 1500) or later
We can drop or simplify many conditionals.
Change-Id: I37e820e515cc09845c30b62c89ddb3b6ff370f97
Diffstat (limited to 'bridges/source/cpp_uno/msvc_win32_intel')
| -rw-r--r-- | bridges/source/cpp_uno/msvc_win32_intel/except.cxx | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx index 9430f29d84a9..497958d0307f 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx @@ -503,13 +503,9 @@ int msci_filterCppException( if (pRecord == 0 || pRecord->ExceptionCode != MSVC_ExceptionCode) return EXCEPTION_CONTINUE_SEARCH; -#if _MSC_VER < 1300 // MSVC -6 - bool rethrow = (pRecord->NumberParameters < 3 || - pRecord->ExceptionInformation[ 2 ] == 0); -#else bool rethrow = __CxxDetectRethrow( &pRecord ); OSL_ASSERT( pRecord == pPointers->ExceptionRecord ); -#endif + if (rethrow && pRecord == pPointers->ExceptionRecord) { // hack to get msvcrt internal _curexception field: @@ -521,15 +517,7 @@ int msci_filterCppException( // crt\src\mtdll.h: // offsetof (_tiddata, _curexception) - // offsetof (_tiddata, _tpxcptinfoptrs): -#if _MSC_VER < 1300 - 0x18 // msvcrt,dll -#elif _MSC_VER < 1310 - 0x20 // msvcr70.dll -#elif _MSC_VER < 1400 - 0x24 // msvcr71.dll -#else - 0x28 // msvcr80.dll -#endif + 0x28 // msvcr80.dll (and later?) ); } // rethrow: handle only C++ exceptions: @@ -576,12 +564,11 @@ int msci_filterCppException( uno_type_any_constructAndConvert( pUnoExc, &exc, ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno ); -#if _MSC_VER < 1400 // msvcr80.dll cleans up, different from former msvcrs + // msvcr80.dll cleans up, different from former msvcrs // if (! rethrow): // though this unknown exception leaks now, no user-defined // exception is ever thrown thru the binary C-UNO dispatcher // call stack. -#endif } else { @@ -589,14 +576,6 @@ int msci_filterCppException( uno_any_constructAndConvert( pUnoExc, (void *) pRecord->ExceptionInformation[1], pExcTypeDescr, pCpp2Uno ); -#if _MSC_VER < 1400 // msvcr80.dll cleans up, different from former msvcrs - if (! rethrow) - { - uno_destructData( - (void *) pRecord->ExceptionInformation[1], - pExcTypeDescr, cpp_release ); - } -#endif typelib_typedescription_release( pExcTypeDescr ); } |