summaryrefslogtreecommitdiffstats
path: root/clang/include/clang/Basic/DiagnosticKinds.def
diff options
context:
space:
mode:
Diffstat (limited to 'clang/include/clang/Basic/DiagnosticKinds.def')
-rw-r--r--clang/include/clang/Basic/DiagnosticKinds.def2
1 files changed, 2 insertions, 0 deletions
diff --git a/clang/include/clang/Basic/DiagnosticKinds.def b/clang/include/clang/Basic/DiagnosticKinds.def
index f265f3ba267..f4e791ca918 100644
--- a/clang/include/clang/Basic/DiagnosticKinds.def
+++ b/clang/include/clang/Basic/DiagnosticKinds.def
@@ -1181,6 +1181,8 @@ DIAG(err_incomplete_base_class, ERROR,
"base class has incomplete type")
DIAG(err_duplicate_base_class, ERROR,
"base class '%0' specified more than once as a direct base class")
+DIAG(err_ambiguous_derived_to_base_conv, ERROR,
+ "ambiguous conversion from derived class '%0' to base class '%1':%2")
DIAG(warn_not_compound_assign, WARNING,
"use of unary operator that may be intended as compound assignment (%0=)")
OpenPOWER on IntegriCloud