r193061 - Be more precise when diagnosing 'inline' on global replacement functions

[David Majnemer]

Author: majnemer
Date: Sun Oct 20 19:22:03 2013
New Revision: 193061

URL: http://llvm.org/viewvc/llvm-project?rev=193061&view=rev
Log:
Be more precise when diagnosing 'inline' on global replacement functions

Modified:
    cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
    cfe/trunk/test/SemaCXX/new-delete.cpp

Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=193061&r1=193060&r2=193061&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Sun Oct 20 19:22:03 2013
@@ -5901,7 +5901,7 @@ def err_operator_new_delete_declared_in_
 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<

Modified: cfe/trunk/test/SemaCXX/new-delete.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/new-delete.cpp?rev=193061&r1=193060&r2=193061&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/new-delete.cpp (original)
+++ cfe/trunk/test/SemaCXX/new-delete.cpp Sun Oct 20 19:22:03 2013
@@ -24,7 +24,7 @@ void* operator new(size_t, int*); // exp
 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 { };