aboutsummaryrefslogtreecommitdiff
path: root/test/SemaCXX/__null.cpp
diff options
context:
space:
mode:
authorChad Rosier <mcrosier@apple.com>2012-03-15 01:00:38 +0000
committerChad Rosier <mcrosier@apple.com>2012-03-15 01:00:38 +0000
commit9ca33fd56720112bcc4bccb8aa6107abbb68cae3 (patch)
tree5b059aa547b1b48a1ce20994614e0b91d6ac605f /test/SemaCXX/__null.cpp
parentd75fb492f7616046797bfe5353e9478d8e25628e (diff)
Revert r152745 as it's breaking the internal buildbots.
Abbreviated commit message: Provide -Wnull-conversion separately from -Wconversion. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@152765 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/SemaCXX/__null.cpp')
-rw-r--r--test/SemaCXX/__null.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/SemaCXX/__null.cpp b/test/SemaCXX/__null.cpp
index 56e59c06f1..1989a45fb5 100644
--- a/test/SemaCXX/__null.cpp
+++ b/test/SemaCXX/__null.cpp
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 -triple x86_64-unknown-unknown %s -Wno-null-conversion -fsyntax-only -verify
-// RUN: %clang_cc1 -triple i686-unknown-unknown %s -Wno-null-conversion -fsyntax-only -verify
+// RUN: %clang_cc1 -triple x86_64-unknown-unknown %s -fsyntax-only -verify
+// RUN: %clang_cc1 -triple i686-unknown-unknown %s -fsyntax-only -verify
void f() {
int* i = __null;