summaryrefslogtreecommitdiff
path: root/compilerplugins
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-04-25 18:06:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-04-25 18:06:43 +0200
commit16228ad68288d1e1dd45956298933cb37aaaf514 (patch)
tree491511e7d09b316b7b0c96f785ef00b872e8f823 /compilerplugins
parenta8d853fd9c1d84d63cf41b31ea548b6be8a621ec (diff)
Lots of violations in gcc3_linux_x86-64/share.hxx, too, when using libc++
Change-Id: I6f32f7b1dcb97c9651bba2c03c495fb70448e524
Diffstat (limited to 'compilerplugins')
-rw-r--r--compilerplugins/clang/reservedid.cxx12
1 files changed, 4 insertions, 8 deletions
diff --git a/compilerplugins/clang/reservedid.cxx b/compilerplugins/clang/reservedid.cxx
index 1517a94eba05..6269b9b98245 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
{