diff options
| -rw-r--r-- | Sema/SemaExpr.cpp | 2 | ||||
| -rw-r--r-- | include/clang/Basic/DiagnosticKinds.def | 2 |
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") |