aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Naroff <snaroff@apple.com>2008-02-01 22:44:48 +0000
committerSteve Naroff <snaroff@apple.com>2008-02-01 22:44:48 +0000
commitc0ff1caab20f13e99cd94e4263ba3e625e1aae92 (patch)
tree20104bb569400bd79bd477ed5d87acf4e767dcfa
parentbe4b3332c2d17c03af6d015d9e8e2cc524806e6e (diff)
Rename diagnostic to reflect it's role...
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@46650 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--Sema/SemaExpr.cpp2
-rw-r--r--include/clang/Basic/DiagnosticKinds.def2
2 files changed, 2 insertions, 2 deletions
diff --git a/Sema/SemaExpr.cpp b/Sema/SemaExpr.cpp
index 278c07fc14..4c8a1d953f 100644
--- a/Sema/SemaExpr.cpp
+++ b/Sema/SemaExpr.cpp
@@ -820,7 +820,7 @@ inline QualType Sema::CheckConditionalOperands( // C99 6.5.15
if (!Context.typesAreCompatible(lhptee.getUnqualifiedType(),
rhptee.getUnqualifiedType())) {
- Diag(questionLoc, diag::ext_typecheck_cond_incompatible_pointers,
+ Diag(questionLoc, diag::warn_typecheck_cond_incompatible_pointers,
lexT.getAsString(), rexT.getAsString(),
lex->getSourceRange(), rex->getSourceRange());
// In this situation, we assume void* type. No especially good
diff --git a/include/clang/Basic/DiagnosticKinds.def b/include/clang/Basic/DiagnosticKinds.def
index 489575c989..c3087fbb3a 100644
--- a/include/clang/Basic/DiagnosticKinds.def
+++ b/include/clang/Basic/DiagnosticKinds.def
@@ -822,7 +822,7 @@ DIAG(err_typecheck_expect_scalar_operand, ERROR,
"operand of type '%0' where arithmetic or pointer type is required")
DIAG(err_typecheck_cond_incompatible_operands, ERROR,
"incompatible operand types ('%0' and '%1')")
-DIAG(ext_typecheck_cond_incompatible_pointers, WARNING,
+DIAG(warn_typecheck_cond_incompatible_pointers, WARNING,
"pointer type mismatch ('%0' and '%1')")
DIAG(err_typecheck_choose_expr_requires_constant, ERROR,
"'__builtin_choose_expr' requires a constant expression")