summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2015-09-15 17:12:49 +0000
committerMarshall Clow <mclow.lists@gmail.com>2015-09-15 17:12:49 +0000
commit20ade932fbdfaf354458e48a7eae9d2d340975fe (patch)
treed4ee4fc499dd3b774ea56ded69163154c46fac6c
parent32764b591797df963a6a6025b8bea625c7a55a81 (diff)
downloadbcm5719-llvm-20ade932fbdfaf354458e48a7eae9d2d340975fe.tar.gz
bcm5719-llvm-20ade932fbdfaf354458e48a7eae9d2d340975fe.zip
Suppress some warnings in the tests that snuck in. That 'tmpnam' is deprecated doesn't change the fact that we have to test it.
llvm-svn: 247704
-rw-r--r--libcxx/test/std/input.output/file.streams/c.files/cstdio.pass.cpp1
-rw-r--r--libcxx/test/std/language.support/support.types/nullptr_t.pass.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/libcxx/test/std/input.output/file.streams/c.files/cstdio.pass.cpp b/libcxx/test/std/input.output/file.streams/c.files/cstdio.pass.cpp
index ec4ad8a3bbc..a06f0443d70 100644
--- a/libcxx/test/std/input.output/file.streams/c.files/cstdio.pass.cpp
+++ b/libcxx/test/std/input.output/file.streams/c.files/cstdio.pass.cpp
@@ -80,6 +80,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wformat-zero-length"
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
int main()
{
diff --git a/libcxx/test/std/language.support/support.types/nullptr_t.pass.cpp b/libcxx/test/std/language.support/support.types/nullptr_t.pass.cpp
index 99bbd3e9154..1cc2aa62032 100644
--- a/libcxx/test/std/language.support/support.types/nullptr_t.pass.cpp
+++ b/libcxx/test/std/language.support/support.types/nullptr_t.pass.cpp
@@ -54,7 +54,7 @@ void test_comparisons()
#if defined(__clang__)
#pragma clang diagnostic push
-#pragma diagnostic ignored "-Wnull-conversion"
+#pragma clang diagnostic ignored "-Wnull-conversion"
#endif
void test_nullptr_conversions() {
{
OpenPOWER on IntegriCloud