aboutsummaryrefslogtreecommitdiff
path: root/include/clang
diff options
context:
space:
mode:
Diffstat (limited to 'include/clang')
-rw-r--r--include/clang/Basic/DiagnosticKinds.def2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/clang/Basic/DiagnosticKinds.def b/include/clang/Basic/DiagnosticKinds.def
index eea6fe4b96..31708b0112 100644
--- a/include/clang/Basic/DiagnosticKinds.def
+++ b/include/clang/Basic/DiagnosticKinds.def
@@ -573,6 +573,8 @@ DIAG(err_accessor_property_type_mismatch, ERROR,
"type of property %0 does not match type of accessor %1")
DIAG(err_setter_type_void, ERROR,
"type of setter must be void")
+DIAG(warn_conflicting_types, WARNING,
+ "conflicting types for %0")
/// C++ parser diagnostics
DIAG(err_expected_unqualified_id, ERROR,