summaryrefslogtreecommitdiffstats
path: root/llvm/unittests/Support
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2015-01-19 10:43:00 +0000
committerChandler Carruth <chandlerc@gmail.com>2015-01-19 10:43:00 +0000
commit93756cff07ba03c7f0d805e02d68f6bf34a71397 (patch)
treef4c193cef3799a04126dbafc406f73609000155c /llvm/unittests/Support
parentad34d91343bba205397955cc8e3e82f6ad99b2d8 (diff)
downloadbcm5719-llvm-93756cff07ba03c7f0d805e02d68f6bf34a71397.tar.gz
bcm5719-llvm-93756cff07ba03c7f0d805e02d68f6bf34a71397.zip
Suppress the newly added Clang warning for the inaccessible base in this
test. Do that after we suppress the warnings for unknown pragmas as this warning flag is quite new in Clang and so old Clang's would warn all the time on this file. llvm-svn: 226444
Diffstat (limited to 'llvm/unittests/Support')
-rw-r--r--llvm/unittests/Support/AlignOfTest.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/unittests/Support/AlignOfTest.cpp b/llvm/unittests/Support/AlignOfTest.cpp
index 40f72958572..1119019de01 100644
--- a/llvm/unittests/Support/AlignOfTest.cpp
+++ b/llvm/unittests/Support/AlignOfTest.cpp
@@ -22,13 +22,13 @@ namespace {
// Suppress direct base '{anonymous}::S1' inaccessible in '{anonymous}::D9'
// due to ambiguity warning.
-//
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
+#pragma clang diagnostic ignored "-Winaccessible-base"
+#elif ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402
// Pragma based warning suppression was introduced in GGC 4.2. Additionally
// this warning is "enabled by default". The warning still appears if -Wall is
// suppressed. Apparently GCC suppresses it when -w is specifed, which is odd.
-// At any rate, clang on the other hand gripes about -Wunknown-pragma, so
-// leaving it out of this.
-#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402 && !defined(__clang__)
#pragma GCC diagnostic warning "-w"
#endif
OpenPOWER on IntegriCloud