diff options
| author | Jacob Bandes-Storch <jacob@bandes-stor.ch> | 2017-12-31 05:13:03 +0000 |
|---|---|---|
| committer | Jacob Bandes-Storch <jacob@bandes-stor.ch> | 2017-12-31 05:13:03 +0000 |
| commit | 352a8a419d7c9515bd05787c0390238f609cd4ae (patch) | |
| tree | d1d0d75a4001cd621e4140752cd5d1aab0022520 /include | |
| parent | e006e0409cc387a371e7a22c1ef84b3048a7deed (diff) | |
Reverted 321592: [Sema] Improve diagnostics for const- and ref-qualified member functions
A few tests need to be fixed
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@321593 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.td | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index e4649d3a44..01e819942f 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -1589,19 +1589,11 @@ def err_non_virtual_pure : Error< def ext_pure_function_definition : ExtWarn< "function definition with pure-specifier is a Microsoft extension">, InGroup<MicrosoftPureDefinition>; -def err_qualified_member_of_unrelated : Error< - "%q0 is not a member of class %1">; - -def err_member_function_call_bad_cvr : Error< - "'this' argument to member function %0 has type %1, but function is not marked " - "%select{const|restrict|const or restrict|volatile|const or volatile|" - "volatile or restrict|const, volatile, or restrict}2">; -def err_member_function_call_bad_ref : Error< - "'this' argument to member function %0 is an %select{lvalue|rvalue}1, " - "but function has %select{non-const lvalue|rvalue}2 ref-qualifier">; -def err_member_function_call_bad_type : Error< +def err_implicit_object_parameter_init : Error< "cannot initialize object parameter of type %0 with an expression " "of type %1">; +def err_qualified_member_of_unrelated : Error< + "%q0 is not a member of class %1">; def warn_call_to_pure_virtual_member_function_from_ctor_dtor : Warning< "call to pure virtual member function %0 has undefined behavior; " @@ -1823,6 +1815,10 @@ def warn_temporary_array_to_pointer_decay : Warning< def err_init_list_bad_dest_type : Error< "%select{|non-aggregate }0type %1 cannot be initialized with an initializer " "list">; +def err_member_function_call_bad_cvr : Error<"member function %0 not viable: " + "'this' argument has type %1, but function is not marked " + "%select{const|restrict|const or restrict|volatile|const or volatile|" + "volatile or restrict|const, volatile, or restrict}2">; def err_reference_bind_to_bitfield : Error< "%select{non-const|volatile}0 reference cannot bind to " |