From cdd0c4d3ff6939367e73ec68570b55a6257eea91 Mon Sep 17 00:00:00 2001
From: Richard Guenther <rguenther@suse.de>
Date: Wed, 2 Dec 2009 20:33:25 +0000
Subject: [PATCH] iinline-1.C: Adjust.

2009-12-02  Richard Guenther  <rguenther@suse.de>

	* g++.dg/ipa/iinline-1.C: Adjust.
	* g++.dg/template/cond2.C: Likewise.
	* g++.dg/template/pr35240.C: Likewise.

From-SVN: r154924
---
 gcc/testsuite/ChangeLog                 | 6 ++++++
 gcc/testsuite/g++.dg/ipa/iinline-1.C    | 2 +-
 gcc/testsuite/g++.dg/template/cond2.C   | 4 ++--
 gcc/testsuite/g++.dg/template/pr35240.C | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dfe0081ae05..dab89fa74a0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-02  Richard Guenther  <rguenther@suse.de>
+
+	* g++.dg/ipa/iinline-1.C: Adjust.
+	* g++.dg/template/cond2.C: Likewise.
+	* g++.dg/template/pr35240.C: Likewise.
+
 2009-12-02  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
 	PR middle-end/42224
diff --git a/gcc/testsuite/g++.dg/ipa/iinline-1.C b/gcc/testsuite/g++.dg/ipa/iinline-1.C
index 6419ac3e8cd..b7b93451cdc 100644
--- a/gcc/testsuite/g++.dg/ipa/iinline-1.C
+++ b/gcc/testsuite/g++.dg/ipa/iinline-1.C
@@ -44,5 +44,5 @@ int main (int argc, char *argv[])
   return 0;
 }
 
-/* { dg-final { scan-ipa-dump "String::funcOne\[^\\n\]*inline copy in main"  "inline"  } } */
+/* { dg-final { scan-ipa-dump "String::funcOne\[^\\n\]*inline copy in int main"  "inline"  } } */
 /* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/g++.dg/template/cond2.C b/gcc/testsuite/g++.dg/template/cond2.C
index e6bd19d40fa..abb6ebb5d46 100644
--- a/gcc/testsuite/g++.dg/template/cond2.C
+++ b/gcc/testsuite/g++.dg/template/cond2.C
@@ -3,8 +3,8 @@
 
 template<int X> class c;
 
-template<int X, int Y> int test(c<X ? : Y>&); // { dg-error "omitted" }
+template<int X, int Y> int test(c<X ? : Y>&);
 
 void test(c<2>*c2) {
-	test<0, 2>(*c2);
+	test<0, 2>(*c2); // { dg-error "omitted" }
 }
diff --git a/gcc/testsuite/g++.dg/template/pr35240.C b/gcc/testsuite/g++.dg/template/pr35240.C
index 1972cf73b87..9b957993efa 100644
--- a/gcc/testsuite/g++.dg/template/pr35240.C
+++ b/gcc/testsuite/g++.dg/template/pr35240.C
@@ -4,9 +4,9 @@
 
 template<int> struct A {};
 
-template<int N> A<sizeof(new int[N][N])> foo();	// { dg-message "unimplemented" }
+template<int N> A<sizeof(new int[N][N])> foo();
 
 void bar()
 {
-  foo<1>();
+  foo<1>(); // { dg-message "unimplemented" }
 }