From e3cc64dec20832769406aa38cde83c7dd4194bf4 Mon Sep 17 00:00:00 2001
From: Ben Cheng <bccheng@google.com>
Date: Tue, 22 Apr 2014 13:33:12 -0700
Subject: [4.9] GCC 4.9.0 official release refresh

Change-Id: Ic99a7da8b44b789a48aeec93b33e93944d6e6767
---
 gcc-4.9/gcc/testsuite/g++.old-deja/g++.jason/overload21.C | 2 +-
 gcc-4.9/gcc/testsuite/g++.old-deja/g++.law/init5.C        | 4 ++--
 gcc-4.9/gcc/testsuite/g++.old-deja/g++.robertl/eb121.C    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'gcc-4.9/gcc/testsuite/g++.old-deja')

diff --git a/gcc-4.9/gcc/testsuite/g++.old-deja/g++.jason/overload21.C b/gcc-4.9/gcc/testsuite/g++.old-deja/g++.jason/overload21.C
index 723979303..125aee0db 100644
--- a/gcc-4.9/gcc/testsuite/g++.old-deja/g++.jason/overload21.C
+++ b/gcc-4.9/gcc/testsuite/g++.old-deja/g++.jason/overload21.C
@@ -1,6 +1,6 @@
 // { dg-do assemble  }
 struct X {
-  void f (int = 4, char = 'r');	// { dg-error "previous specification" } 
+  void f (int = 4, char = 'r');	// { dg-message "previous specification" } 
   void g (int = 4, char = 'r');	// { dg-message "previous specification" } 
 };
 
diff --git a/gcc-4.9/gcc/testsuite/g++.old-deja/g++.law/init5.C b/gcc-4.9/gcc/testsuite/g++.old-deja/g++.law/init5.C
index c1d647b1b..7ed89e219 100644
--- a/gcc-4.9/gcc/testsuite/g++.old-deja/g++.law/init5.C
+++ b/gcc-4.9/gcc/testsuite/g++.old-deja/g++.law/init5.C
@@ -11,8 +11,8 @@ extern int fred( int);
 
 class X {
       public :
-      void f( int = fred( 0) ) ; // { dg-error "" } previous spec
+      void f( int = fred( 0) ) ; // { dg-message "previous spec" }
 } ;
 
-void X::f( int x = fred( 0) ) {// { dg-error "" } .*
+void X::f( int x = fred( 0) ) { // { dg-error "default argument" }
 }
diff --git a/gcc-4.9/gcc/testsuite/g++.old-deja/g++.robertl/eb121.C b/gcc-4.9/gcc/testsuite/g++.old-deja/g++.robertl/eb121.C
index e01d74788..036c8d515 100644
--- a/gcc-4.9/gcc/testsuite/g++.old-deja/g++.robertl/eb121.C
+++ b/gcc-4.9/gcc/testsuite/g++.old-deja/g++.robertl/eb121.C
@@ -3,7 +3,7 @@ class A {
 private:
   int i1_;
 public:
-  void f(int const i1 = 1); // { dg-error "previous specification" }
+  void f(int const i1 = 1); // { dg-message "previous specification" }
 };
 
 void
-- 
cgit v1.2.3