diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-08-16 10:02:44 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-08-16 13:47:47 +0200 |
| commit | 0a99baa1f96b4baf5be7c776c7fb2e5e7c94a351 (patch) | |
| tree | 50ee55241ab31cb0fd2b8a211385febe296dad72 /bridges | |
| parent | fe500e0472e4fa61506363e4b0b67eca6f490f5b (diff) | |
-Werror,-Wmultichar (clang-cl)
(<https://docs.microsoft.com/en-us/cpp/cpp/string-and-character-literals-cpp>
specifies that, for MSVC, "Multiple characters in the literal fill corresponding
bytes as needed from high-order to low-order.")
Change-Id: I192be65adf3bfff1a4d0f0f4862939be2736ffad
Reviewed-on: https://gerrit.libreoffice.org/59154
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/msvc_win32_intel/except.cxx | 2 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx index 07db561f1df7..82fcf345cd0d 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx @@ -493,7 +493,7 @@ bool DetectRethrow(void* ppExcept) }; constexpr auto PER_IS_MSVC_EH = [](EHExceptionRecord* p) { - constexpr DWORD EH_EXCEPTION_NUMBER = ('msc' | 0xE0000000); // The NT Exception # that msvcrt uses + constexpr DWORD EH_EXCEPTION_NUMBER = 0xE06D7363; // The NT Exception # that msvcrt uses ('msc' | 0xE0000000) constexpr DWORD EH_MAGIC_NUMBER1 = 0x19930520; // latest magic # in thrown object constexpr DWORD EH_MAGIC_NUMBER2 = 0x19930521; // latest magic # in func info for exception specs constexpr DWORD EH_MAGIC_NUMBER3 = 0x19930522; // latest magic # 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 374fd454ce94..f2e0cdc594a5 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -808,7 +808,7 @@ bool DetectRethrow(void* ppExcept) }; constexpr auto PER_IS_MSVC_EH = [](EHExceptionRecord* p) { - constexpr DWORD EH_EXCEPTION_NUMBER = ('msc' | 0xE0000000); // The NT Exception # that msvcrt uses + constexpr DWORD EH_EXCEPTION_NUMBER = 0xE06D7363; // The NT Exception # that msvcrt uses ('msc' | 0xE0000000) constexpr DWORD EH_MAGIC_NUMBER1 = 0x19930520; // latest magic # in thrown object constexpr DWORD EH_MAGIC_NUMBER2 = 0x19930521; // latest magic # in func info for exception specs constexpr DWORD EH_MAGIC_NUMBER3 = 0x19930522; // latest magic # |