[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp

[Dennis Francis (via logerrit)]

 wsd/LOOLWSD.cpp |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit a22392d8270de5d6aa411d88e8202a199347ebcf
Author:     Dennis Francis <dennis.francis at collabora.com>
AuthorDate: Wed May 20 01:28:50 2020 +0530
Commit:     Dennis Francis <dennis.francis at collabora.com>
CommitDate: Sun Jul 5 10:09:40 2020 +0200

    supress clang -Wparentheses-equality for WIF*() spurious case
    
    Change-Id: I213ba6085aa1b662d5a6283cf9d84742bce288e1
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97971
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Dennis Francis <dennis.francis at collabora.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 90be88646..9815e4158 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1636,6 +1636,15 @@ bool LOOLWSD::checkAndRestoreForKit()
     return false;
 #else
 
+// clang issues warning for WIF*() macro usages below:
+// "equality comparison with extraneous parentheses [-Werror,-Wparentheses-equality]"
+// https://bugs.llvm.org/show_bug.cgi?id=22949
+
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wparentheses-equality"
+#endif
+
     if (ForKitProcId == -1)
     {
         // Fire the ForKit process for the first time.
@@ -1713,6 +1722,11 @@ bool LOOLWSD::checkAndRestoreForKit()
     }
 
     return false;
+
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
+
 #endif
 }