From bac4175b6944c9c22680c0ae3bb9578391a22d7d Mon Sep 17 00:00:00 2001
From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Fri, 29 Jan 2010 15:27:42 +0000
Subject: [PATCH] eh16.C: Rename err to e.

	* g++.old-deja/g++.mike/eh16.C: Rename err to e.
	* g++.old-deja/g++.mike/eh17.C: Likewise.
	* g++.old-deja/g++.mike/p5571.C: Likewise.

From-SVN: r156353
---
 gcc/testsuite/ChangeLog                     |  6 ++++++
 gcc/testsuite/g++.old-deja/g++.mike/eh16.C  |  6 +++---
 gcc/testsuite/g++.old-deja/g++.mike/eh17.C  |  6 +++---
 gcc/testsuite/g++.old-deja/g++.mike/p5571.C | 10 +++++-----
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 273395e..d6b3d46 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-29  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* g++.old-deja/g++.mike/eh16.C: Rename err to e.
+	* g++.old-deja/g++.mike/eh17.C: Likewise.
+	* g++.old-deja/g++.mike/p5571.C: Likewise.
+
 2010-01-29  Dodji Seketeli  <dodji@redhat.com>
 
 	PR c++/42758
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh16.C b/gcc/testsuite/g++.old-deja/g++.mike/eh16.C
index 829bdf2..73beac0 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh16.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh16.C
@@ -1,11 +1,11 @@
 // { dg-do run { xfail sparc64-*-elf arm-*-pe } }
 // { dg-options "-fexceptions" }
 
-int err = 1;
+int e = 1;
 
 struct A {
   ~A() {
-    --err;
+    --e;
   }
 };
 
@@ -20,7 +20,7 @@ main() {
   try {
     B b;
   } catch (...) {
-    return err;
+    return e;
   }
   return 1;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh17.C b/gcc/testsuite/g++.old-deja/g++.mike/eh17.C
index c96c344..5b066c9 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh17.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh17.C
@@ -1,11 +1,11 @@
 // { dg-do run { xfail sparc64-*-elf arm-*-pe } }
 // { dg-options "-fexceptions" }
 
-int err = 1;
+int e = 1;
 
 struct A {
   ~A() {
-    --err;
+    --e;
   }
 };
 
@@ -19,7 +19,7 @@ main() {
   try {
     B b;
   } catch (...) {
-    return err;
+    return e;
   }
   return 1;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p5571.C b/gcc/testsuite/g++.old-deja/g++.mike/p5571.C
index 792fc1d..b03675f 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p5571.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p5571.C
@@ -1,7 +1,7 @@
 // { dg-do run  }
 // prms-id: 5571
 
-int err = 0;
+int e = 0;
 void *vp = 0;
 
 class ParentOne {
@@ -36,7 +36,7 @@ struct Student : public Child {
     else
       {
 	if (vp != (void *)this)
-	  ++err;
+	  ++e;
       }
   }
   void LocalPrintThis() {
@@ -45,7 +45,7 @@ struct Student : public Child {
     else
       {
 	if (vp != (void *)this)
-	  ++err;
+	  ++e;
       }
     PrintThis();
   }
@@ -55,7 +55,7 @@ struct Student : public Child {
     else
       {
 	if (vp != (void *)this)
-	  ++err;
+	  ++e;
       }
     Student::PrintThis();
   }
@@ -67,5 +67,5 @@ int main() {
   o.ForcedPrintThis();
   Child* pX = &o;
   pX->PrintThis();
-  return err;
+  return e;
 }
-- 
2.7.4