[Libreoffice-commits] core.git: compilerplugins/clang

[Stephan Bergmann]

 compilerplugins/clang/reservedid.cxx |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 16228ad68288d1e1dd45956298933cb37aaaf514
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Apr 25 18:06:01 2016 +0200

    Lots of violations in gcc3_linux_x86-64/share.hxx, too, when using libc++
    
    Change-Id: I6f32f7b1dcb97c9651bba2c03c495fb70448e524

diff --git a/compilerplugins/clang/reservedid.cxx b/compilerplugins/clang/reservedid.cxx
index 1517a94..6269b9b 100644
--- a/compilerplugins/clang/reservedid.cxx
+++ b/compilerplugins/clang/reservedid.cxx
@@ -103,8 +103,10 @@ bool ReservedId::VisitNamedDecl(NamedDecl const * decl) {
         return true;
     }
     auto filename = compiler.getSourceManager().getFilename(spelLoc);
-    if (filename
-        == SRCDIR "/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx")
+    if ((filename
+         == SRCDIR "/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx")
+        || (filename
+            == SRCDIR "/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx"))
     {
         return true;
     }
@@ -129,12 +131,6 @@ bool ReservedId::VisitNamedDecl(NamedDecl const * decl) {
             && s != "__GLXFBConfigRec" // vcl/unx/glxtest.cxx
             && s != "__PK11_GetKeyData"
                 // xmlsecurity/source/xmlsec/nss/nssrenam.h
-            && s != "__cxa_eh_globals"
-                // bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
-            && s != "__cxa_exception"
-                // bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
-            && s != "__cxxabiv1"
-                // bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
             && s != "__data_start" // sal/osl/unx/system.cxx
             && s != "__lxstat") // setup_native/scripts/source/getuid.c
         {