c++: update diagnostic messages

These tests needed updating for the diagnostic change in r12-1306.

gcc/testsuite/ChangeLog:

	* g++.dg/cpp0x/pr60209-neg.C: Update diagnostic.
	* g++.dg/diagnostic/string-literal-concat.C: Likewise.
	* g++.dg/ext/utf-badconcat.C: Likewise.
	* g++.dg/ext/utf-badconcat2.C: Likewise.

4 files changed, 16 insertions, 16 deletions

diff --git a/gcc/testsuite/g++.dg/cpp0x/pr60209-neg.C b/gcc/testsuite/g++.dg/cpp0x/pr60209-neg.C
index 77fd3d8..6c3ad0c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr60209-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr60209-neg.C
@@ -17,7 +17,7 @@ void operator L"" "" _x(unsigned long long); // { dg-error "invalid encoding pre
 
 void operator u8"" "" _y(unsigned long long); // { dg-error "invalid encoding prefix in literal operator" }
 
-void operator u"" L"" _z(unsigned long long); // { dg-error "unsupported non-standard concatenation of string literals" }
+void operator u"" L"" _z(unsigned long long); // { dg-error "concatenation of string literals with conflicting encoding prefixes" }
 
 void operator ""_p ""_q(unsigned long long); // { dg-error "inconsistent user-defined literal suffixes" }
 
diff --git a/gcc/testsuite/g++.dg/diagnostic/string-literal-concat.C b/gcc/testsuite/g++.dg/diagnostic/string-literal-concat.C
index 4ede799..326520e 100644
--- a/gcc/testsuite/g++.dg/diagnostic/string-literal-concat.C
+++ b/gcc/testsuite/g++.dg/diagnostic/string-literal-concat.C
@@ -1,12 +1,12 @@
 /* { dg-options "-fdiagnostics-show-caret -std=c++11" } */
 
-const void *s = u8"a"  u"b";  // { dg-error "24: non-standard concatenation" }
+const void *s = u8"a"  u"b";  // { dg-error "24: concatenation" }
 /* { dg-begin-multiline-output "" }
  const void *s = u8"a"  u"b";
                  ~~~~~  ^~~~
    { dg-end-multiline-output "" } */
 
-const void *s2 = u"a"  u"b"  u8"c";  // { dg-error "30: non-standard concatenation" }
+const void *s2 = u"a"  u"b"  u8"c";  // { dg-error "30: concatenation" }
 /* { dg-begin-multiline-output "" }
  const void *s2 = u"a"  u"b"  u8"c";
                         ~~~~  ^~~~~
@@ -16,7 +16,7 @@ const void *s2 = u"a"  u"b"  u8"c";  // { dg-error "30: non-standard concatenati
 
 const void *s3 = TEST_U8_LITERAL u8"b";
 
-const void *s4 = TEST_U8_LITERAL u"b"; // { dg-error "34: non-standard concatenation" }
+const void *s4 = TEST_U8_LITERAL u"b"; // { dg-error "34: concatenation" }
 /* { dg-begin-multiline-output "" }
  const void *s4 = TEST_U8_LITERAL u"b";
                                   ^~~~
diff --git a/gcc/testsuite/g++.dg/ext/utf-badconcat.C b/gcc/testsuite/g++.dg/ext/utf-badconcat.C
index 4079b83..550e0da 100644
--- a/gcc/testsuite/g++.dg/ext/utf-badconcat.C
+++ b/gcc/testsuite/g++.dg/ext/utf-badconcat.C
@@ -4,15 +4,15 @@
 
 const void *s0	= u"a"  "b";
 const void *s1	=  "a" u"b";
-const void *s2	= u"a" U"b";	/* { dg-error "non-standard concatenation" } */
-const void *s3	= U"a" u"b";	/* { dg-error "non-standard concatenation" } */
-const void *s4	= u"a" L"b";	/* { dg-error "non-standard concatenation" } */
-const void *s5	= L"a" u"b";	/* { dg-error "non-standard concatenation" } */
+const void *s2	= u"a" U"b";	/* { dg-error "concatenation" } */
+const void *s3	= U"a" u"b";	/* { dg-error "concatenation" } */
+const void *s4	= u"a" L"b";	/* { dg-error "concatenation" } */
+const void *s5	= L"a" u"b";	/* { dg-error "concatenation" } */
 const void *s6	= u"a" u"b";
 const void *s7	= U"a"  "b";
 const void *s8	=  "a" U"b";
-const void *s9	= U"a" L"b";	/* { dg-error "non-standard concatenation" } */
-const void *sa	= L"a" U"b";	/* { dg-error "non-standard concatenation" } */
+const void *s9	= U"a" L"b";	/* { dg-error "concatenation" } */
+const void *sa	= L"a" U"b";	/* { dg-error "concatenation" } */
 const void *sb	= U"a" U"b";
 const void *sc	= L"a"  "b";
 const void *sd	=  "a" L"b";
diff --git a/gcc/testsuite/g++.dg/ext/utf-badconcat2.C b/gcc/testsuite/g++.dg/ext/utf-badconcat2.C
index 0d3fe33..535d926 100644
--- a/gcc/testsuite/g++.dg/ext/utf-badconcat2.C
+++ b/gcc/testsuite/g++.dg/ext/utf-badconcat2.C
@@ -4,11 +4,11 @@
 const void *s0	= u8"a"   "b";
 const void *s1	=   "a" u8"b";
 const void *s2	= u8"a" u8"b";
-const void *s3	= u8"a"  u"b";	// { dg-error "non-standard concatenation" }
-const void *s4	=  u"a" u8"b";	// { dg-error "non-standard concatenation" }
-const void *s5	= u8"a"  U"b";	// { dg-error "non-standard concatenation" }
-const void *s6	=  U"a" u8"b";	// { dg-error "non-standard concatenation" }
-const void *s7	= u8"a"  L"b";	// { dg-error "non-standard concatenation" }
-const void *s8	=  L"a" u8"b";	// { dg-error "non-standard concatenation" }
+const void *s3	= u8"a"  u"b";	// { dg-error "concatenation" }
+const void *s4	=  u"a" u8"b";	// { dg-error "concatenation" }
+const void *s5	= u8"a"  U"b";	// { dg-error "concatenation" }
+const void *s6	=  U"a" u8"b";	// { dg-error "concatenation" }
+const void *s7	= u8"a"  L"b";	// { dg-error "concatenation" }
+const void *s8	=  L"a" u8"b";	// { dg-error "concatenation" }
 
 int main () {}