[Libreoffice-commits] core.git: bridges/source

[David Ostrovsky]

 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 684facf115df0f06bc3cf405b4429f97b0891370
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Sun Nov 30 12:35:37 2014 +0100

    MSVC 2013: Compute uno bridge exception offset for X64
    
    Change-Id: I34b308db422d861098fdf93cff8fea63128ba47a
    Reviewed-on: https://gerrit.libreoffice.org/13211
    Tested-by: David Ostrovsky <david at ostrovsky.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

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 a1c27c6..b6727ea 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -722,7 +722,9 @@ int mscx_filterCppException(
             // MSVS9/crt/src/mtdll.h:
             // offsetof (_tiddata, _curexception) -
             // offsetof (_tiddata, _tpxcptinfoptrs):
-#if _MSC_VER < 1600
+#if _MSC_VER <= 1800 // VC 2013
+            //
+            // See dev-tools/uno/uno_exception_offset
             0x48 // msvcr90.dll
 #else
             error, please find value for this compiler version