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

[Libreoffice Gerrit user]

 bridges/source/cpp_uno/msvc_win32_intel/except.cxx  |    6 +++---
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit fe500e0472e4fa61506363e4b0b67eca6f490f5b
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Aug 16 10:06:23 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Aug 16 13:46:49 2018 +0200

    loplugin:reservedid (clang-cl)
    
    Change-Id: I324b93db2040efeff9d56f529df998cb8d64ec03
    Reviewed-on: https://gerrit.libreoffice.org/59155
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index 7af24e97c868..07db561f1df7 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -475,7 +475,7 @@ namespace
 // increment __ProcessingThrow, and so does not break following exception handling. We rely on the
 // definition of EHExceptionRecord, PER_IS_MSVC_EH and PER_PTHROW, that are current as of msvcrt
 // 2017 (14.14.26428).
-bool __DetectRethrow(void* ppExcept)
+bool DetectRethrow(void* ppExcept)
 {
     struct EHExceptionRecord
     {
@@ -513,7 +513,7 @@ bool __DetectRethrow(void* ppExcept)
     EHExceptionRecord* pExcept;
     if (!ppExcept)
         return false;
-    pExcept = *(EHExceptionRecord**)ppExcept;
+    pExcept = *static_cast<EHExceptionRecord**>(ppExcept);
     if (PER_IS_MSVC_EH(pExcept) && PER_PTHROW(pExcept) == nullptr)
     {
         return true;
@@ -532,7 +532,7 @@ int msci_filterCppException(
     if (pRecord == 0 || pRecord->ExceptionCode != MSVC_ExceptionCode)
         return EXCEPTION_CONTINUE_SEARCH;
 
-    const bool rethrow = __DetectRethrow(&pRecord);
+    const bool rethrow = DetectRethrow(&pRecord);
     assert(pRecord == pPointers->ExceptionRecord);
 
     if (rethrow && pRecord == pPointers->ExceptionRecord)
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 c03716151bbc..374fd454ce94 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -789,7 +789,7 @@ namespace
 // increment __ProcessingThrow, and so does not break following exception handling. We rely on the
 // definition of EHExceptionRecord, PER_IS_MSVC_EH and PER_PTHROW, that are current as of msvcrt
 // 2017 (14.14.26428).
-bool __DetectRethrow(void* ppExcept)
+bool DetectRethrow(void* ppExcept)
 {
     struct EHExceptionRecord
     {
@@ -828,7 +828,7 @@ bool __DetectRethrow(void* ppExcept)
     EHExceptionRecord* pExcept;
     if (!ppExcept)
         return false;
-    pExcept = *(EHExceptionRecord**)ppExcept;
+    pExcept = *static_cast<EHExceptionRecord**>(ppExcept);
     if (PER_IS_MSVC_EH(pExcept) && PER_PTHROW(pExcept) == nullptr)
     {
         return true;
@@ -851,7 +851,7 @@ int mscx_filterCppException(
     if (pRecord == nullptr || pRecord->ExceptionCode != MSVC_ExceptionCode)
         return EXCEPTION_CONTINUE_SEARCH;
 
-    const bool rethrow = __DetectRethrow(&pRecord);
+    const bool rethrow = DetectRethrow(&pRecord);
     assert(pRecord == pPointers->ExceptionRecord);
 
     if (rethrow && pRecord == pPointers->ExceptionRecord)