aboutsummaryrefslogtreecommitdiff
path: root/include/clang
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2008-12-05 18:18:52 +0000
committerFariborz Jahanian <fjahanian@apple.com>2008-12-05 18:18:52 +0000
commit8daab970b80ed2e751fc88327180acbeff1dbb9c (patch)
treec0528779be503b4b2913a5984cf9ecf8ea23fac9 /include/clang
parent72c3f314d92d65c050ee1c07b7753623c044d6c7 (diff)
(instance/class) Method type checking between class and its implementation.
(instance/class) Method type checking between category and its implementation. And a test case for all. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@60598 91177308-0d34-0410-b5e6-96231b3b80d8
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,