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

[Noel Grandin (via logerrit)]

 svl/source/misc/sharedstringpool.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 89b8e97bf325a92f49756fe903b322653cd88266
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Sep 9 10:17:33 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Sep 9 11:16:49 2021 +0200

    workaround -Wshadow in libcuckoo
    
    that triggers with
        gcc (Ubuntu 10.3.0-1ubuntu1~20.10) 10.3.0
    
    Change-Id: I038e229890fcc3c8bb7986a747434e9e033b4f5e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121838
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/svl/source/misc/sharedstringpool.cxx b/svl/source/misc/sharedstringpool.cxx
index bf1f5554b957..7abe3ea77507 100644
--- a/svl/source/misc/sharedstringpool.cxx
+++ b/svl/source/misc/sharedstringpool.cxx
@@ -15,6 +15,10 @@
 #include <unordered_map>
 #include <unordered_set>
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#endif
 #if defined __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -30,6 +34,9 @@
 #if defined __clang__
 #pragma clang diagnostic pop
 #endif
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
 namespace svl
 {