diff options
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 | ||||
| -rw-r--r-- | clang/test/SemaCXX/new-delete.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index d582ad5ad7d..8797ef5ce1a 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -5901,7 +5901,7 @@ def err_operator_new_delete_declared_in_namespace : Error< def err_operator_new_delete_declared_static : Error< "%0 cannot be declared static in global scope">; def err_operator_new_delete_declared_inline : Error< - "%0 cannot be declared 'inline'">; + "replacement function %0 cannot be declared 'inline'">; def err_operator_new_delete_invalid_result_type : Error< "%0 must return type %1">; def err_operator_new_delete_dependent_result_type : Error< diff --git a/clang/test/SemaCXX/new-delete.cpp b/clang/test/SemaCXX/new-delete.cpp index de26cad62e1..63ec4ccae38 100644 --- a/clang/test/SemaCXX/new-delete.cpp +++ b/clang/test/SemaCXX/new-delete.cpp @@ -24,7 +24,7 @@ void* operator new(size_t, int*); // expected-note 3 {{candidate}} void* operator new(size_t, float*); // expected-note 3 {{candidate}} void* operator new(size_t, S); // expected-note 2 {{candidate}} -inline void operator delete(void *); // expected-error {{'operator delete' cannot be declared 'inline'}} +inline void operator delete(void *); // expected-error {{replacement function 'operator delete' cannot be declared 'inline'}} struct foo { }; |
