Initialization improvements: addition of string initialization and a few

small bug fixes in SemaInit, switch over SemaDecl to use it more often, and
change a bunch of diagnostics which are different with the new initialization
code.

llvm-svn: 91767

1 files changed, 2 insertions, 2 deletions

diff --git a/clang/test/SemaCXX/deleted-function.cpp b/clang/test/SemaCXX/deleted-function.cpp
index c827b6e75e1..572ef343309 100644
--- a/clang/test/SemaCXX/deleted-function.cpp
+++ b/clang/test/SemaCXX/deleted-function.cpp
@@ -18,7 +18,7 @@ void ov(double) = delete; // expected-note {{candidate function has been explici
 struct WithDel {
   WithDel() = delete; // expected-note {{candidate function has been explicitly deleted}}
   void fn() = delete; // expected-note {{function has been explicitly marked deleted here}}
-  operator int() = delete; 
+  operator int() = delete; // expected-note {{function has been explicitly marked deleted here}}
   void operator +(int) = delete;
 
   int i = delete; // expected-error {{only functions can have deleted definitions}}
@@ -32,5 +32,5 @@ void test() {
   WithDel dd; // expected-error {{call to deleted constructor of 'dd'}}
   WithDel *d = 0;
   d->fn(); // expected-error {{attempt to use a deleted function}}
-  int i = *d; // expected-error {{incompatible type initializing}}
+  int i = *d; // expected-error {{invokes a deleted function}}
 }