From b75009c53084f97a8e295164c07d1007e66ccefa Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Mon, 21 Oct 2013 00:22:03 +0000 Subject: [PATCH] Be more precise when diagnosing 'inline' on global replacement functions git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@193061 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/DiagnosticSemaKinds.td | 2 +- test/SemaCXX/new-delete.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index d582ad5ad7..8797ef5ce1 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/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/test/SemaCXX/new-delete.cpp b/test/SemaCXX/new-delete.cpp index de26cad62e..63ec4ccae3 100644 --- a/test/SemaCXX/new-delete.cpp +++ b/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 { }; -- 2.40.0