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

[Caolán McNamara (via logerrit)]

 bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 8ff57504f75ddd35c3f585cf2224c6fcc3863ca3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Aug 21 21:38:46 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Aug 22 13:10:05 2021 +0200

    WaE: protect clang diagnostic push/pop with if defined __clang__
    
    Change-Id: I8360aa96097a13b6bad1283edddc7c2fd1ed510d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120832
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index a22ac393b5f7..001384e005fc 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -187,11 +187,15 @@ static void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionRefer
 #if !defined(__ARM_PCS_VFP) && (defined(__ARM_EABI__) || defined(__SOFTFP__))
             pRegisterReturn[0] = r0;
 #else
+#if defined __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wuninitialized"
+#endif
             register float fret asm("s0");
             *reinterpret_cast<float *>(pRegisterReturn) = fret;
+#if defined __clang__
 #pragma clang diagnostic pop
+#endif
 #endif
         break;
         case typelib_TypeClass_DOUBLE:
@@ -199,11 +203,15 @@ static void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionRefer
             pRegisterReturn[1] = r1;
             pRegisterReturn[0] = r0;
 #else
+#if defined __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wuninitialized"
+#endif
             register double dret asm("d0");
             *reinterpret_cast<double *>(pRegisterReturn) = dret;
+#if defined __clang__
 #pragma clang diagnostic pop
+#endif
 #endif
             break;
         case typelib_TypeClass_STRUCT: