From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Fri, 29 Jan 2010 15:34:07 +0000 (+0000)
Subject: task-1.C: Renamed err to e.
X-Git-Tag: releases/gcc-4.5.0~990
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41d1138f79771988badef3ea72e6c4c3dac8bebc;p=thirdparty%2Fgcc.git

task-1.C: Renamed err to e.

	* testsuite/libgomp.c++/task-1.C: Renamed err to e.
	* testsuite/libgomp.c++/task-6.C: Likewise.

From-SVN: r156354
---

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 246d411384be..dcd532f06b62 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-29  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* testsuite/libgomp.c++/task-1.C: Renamed err to e.
+	* testsuite/libgomp.c++/task-6.C: Likewise.
+
 2010-01-28  Steve Ellcey  <sje@cup.hp.com>
 
 	* configure.tgt (*-*-hpux*): Add -frandom-seed flag.
diff --git a/libgomp/testsuite/libgomp.c++/task-1.C b/libgomp/testsuite/libgomp.c++/task-1.C
index 535a8287b0cf..94ab6f21f18b 100644
--- a/libgomp/testsuite/libgomp.c++/task-1.C
+++ b/libgomp/testsuite/libgomp.c++/task-1.C
@@ -20,7 +20,7 @@ f1 (int i, int j, int k)
 }
 
 int v1 = 1, v2 = 2, v5 = 5;
-int err;
+int e;
 
 void
 f2 (void)
@@ -35,12 +35,12 @@ f2 (void)
       #pragma omp task
 	{
 	  if (++v1 != 8 || ++v2 != 3 || ++v3 != 4 || ++v4 != 5 || ++v5 != 6)
-	    err = 1;
+	    e = 1;
 	}
       #pragma omp taskwait
       if (v1 != 7 || v2 != 2 || v3 != 3 || v4 != 4 || v5 != 6)
 	abort ();
-      if (err)
+      if (e)
 	abort ();
     }
   }
diff --git a/libgomp/testsuite/libgomp.c++/task-6.C b/libgomp/testsuite/libgomp.c++/task-6.C
index cc9072b9d1c2..389e1e218e4b 100644
--- a/libgomp/testsuite/libgomp.c++/task-6.C
+++ b/libgomp/testsuite/libgomp.c++/task-6.C
@@ -21,7 +21,7 @@ f1 (T i, T j, T k)
 }
 
 int v1 = 1, v2 = 2, v5 = 5;
-int err;
+int e;
 
 template <typename T>
 void
@@ -37,12 +37,12 @@ f2 (void)
       #pragma omp task
 	{
 	  if (++v1 != 8 || ++v2 != 3 || ++v3 != 4 || ++v4 != 5 || ++v5 != 6)
-	    err = 1;
+	    e = 1;
 	}
       #pragma omp taskwait
       if (v1 != 7 || v2 != 2 || v3 != 3 || v4 != 4 || v5 != 6)
 	abort ();
-      if (err)
+      if (e)
 	abort ();
     }
   }