Merge remote branch 'trunk' into constexprconstexpr

6 files changed, 6 insertions, 6 deletions

diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ex1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ex1.C
index f2b53846ecb..c7757f47598 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ex1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ex1.C
@@ -55,7 +55,7 @@ constexpr complex I(0, 1);  // OK -- literal complex
 
 
 // 2 invoked with non-const args
-double x5 = 1.0;
+double x5 = 1.0;	       // { dg-message "not declared .constexpr" }
 constexpr complex unit(x5, 0);	// { dg-error "x5|argument" } error: x5 non-constant
 const complex one(x5, 0);   // OK, ‘‘ordinary const’’ -- dynamic
                            //   initialization
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ex3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ex3.C
index 597603c39a4..08552cd7de7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ex3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ex3.C
@@ -15,7 +15,7 @@ struct B
   constexpr B(T _t): t(_t) { }
 };
 
-B<int> b(1);
+B<int> b(1);		       // { dg-message "not declared .constexpr" }
 SA(b.t==1);			// { dg-error "non-constant condition|'b'" }
 constexpr B<int> b2(1);
 SA(b2.t==1);
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-function2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-function2.C
index 5e0c101b2ba..a902e0e226c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-function2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-function2.C
@@ -17,7 +17,7 @@ inline constexpr double
 squared(double x) { return x * x; }
 
 constexpr int squarei(int x) { return x * x; }
-extern const int side;
+extern const int side; // { dg-message "not initialized with a constant expression" }
 constexpr int area = squarei(side); // { dg-error "side|argument" }
 // error: squarei(side) is not a constant expression
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-neg1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-neg1.C
index ce01f8b5d44..8294afa9837 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-neg1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-neg1.C
@@ -18,7 +18,7 @@ constexpr pixel::pixel(int a)
 
 // error: square not defined, so small(2) not constant (5.19), so constexpr
 // not satisfied
-constexpr pixel small(2);	// { dg-error "" }
+constexpr pixel small(2);	// { dg-message "in constexpr expansion" }
 
 // error: not for parameters
 int next(constexpr int x) {	// { dg-error "parameter" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg.C
index 2c53595833e..7637c0a05bc 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg.C
@@ -7,7 +7,7 @@ struct B {
   int i;
 };
 
-int global; // not constant
+int global;			// { dg-message "not const" }
 
 struct D : B {
   constexpr D() : B(global) { }   // { dg-error "global|argument" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-throw.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-throw.C
index 345b24097b1..f1ef9dc7d0d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-throw.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-throw.C
@@ -4,5 +4,5 @@ constexpr int may_throw(bool decide) {
 	return decide ? 42 : throw -1; // { dg-error "throw" }
 }
 
-constexpr int x = may_throw(false); // { dg-error "may_throw" }
+constexpr int x = may_throw(false); // { dg-message "may_throw" }
 constexpr int y = may_throw(true);