summaryrefslogtreecommitdiffstats
path: root/include/clang/Basic/DiagnosticSemaKinds.td
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 /include/clang/Basic/DiagnosticSemaKinds.td
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 'include/clang/Basic/DiagnosticSemaKinds.td')
-rw-r--r--include/clang/Basic/DiagnosticSemaKinds.td2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index 0670d1f31a..463db06d09 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -1732,7 +1732,7 @@ def warn_impcast_bool_to_null_pointer : Warning<
"expression">, InGroup<BoolConversions>;
def warn_impcast_null_pointer_to_integer : Warning<
"implicit conversion of NULL constant to integer">,
- InGroup<NullConversion>;
+ InGroup<DiagGroup<"conversion">>, DefaultIgnore;
def warn_impcast_function_to_bool : Warning<
"address of function %q0 will always evaluate to 'true'">,
InGroup<BoolConversions>;