From 5173589a0e173c664e85fc5833f26aa2b5b037b5 Mon Sep 17 00:00:00 2001
From: bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 19 Dec 2011 23:29:14 +0000
Subject: [PATCH] 2011-12-19  Benjamin Kosnik  <bkoz@redhat.com>

	* testsuite/performance/25_algorithms/search_n.cc: Disambiguate
	local variable.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182510 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libstdc++-v3/ChangeLog                                       | 5 +++++
 libstdc++-v3/testsuite/performance/25_algorithms/search_n.cc | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 957d963..07a8d7f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-19  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* testsuite/performance/25_algorithms/search_n.cc: Disambiguate
+	local variable.
+
 2011-12-18  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
 	* doc/xml/manual/iterators.xml: Replace "sect1" with "section".
diff --git a/libstdc++-v3/testsuite/performance/25_algorithms/search_n.cc b/libstdc++-v3/testsuite/performance/25_algorithms/search_n.cc
index 13bc6ad..596ded8 100644
--- a/libstdc++-v3/testsuite/performance/25_algorithms/search_n.cc
+++ b/libstdc++-v3/testsuite/performance/25_algorithms/search_n.cc
@@ -31,7 +31,7 @@ using namespace __gnu_test;
 
 const int length = 10000000;
 const int match_length = 3;
-int array[length];
+int ary[length];
 
 int
 main(void)
@@ -41,10 +41,10 @@ main(void)
   int match = rand() % (match_length - 1);
   for(int i = 0; i < length; i++)
     {
-      array[i] = (match != 0) ? 1 : 0;
+      ary[i] = (match != 0) ? 1 : 0;
       if(--match < 0) match = rand() % (match_length - 1);
     }
-  __gnu_test::test_container<int, forward_iterator_wrapper> fcon(array, array + length);
+  __gnu_test::test_container<int, forward_iterator_wrapper> fcon(ary, ary + length);
   start_counters(time, resource);
   for(int i = 0; i < 100; i++)
     search_n(fcon.begin(), fcon.end(), 10, 1);
@@ -52,7 +52,7 @@ main(void)
   report_performance(__FILE__, "forward iterator", time, resource);
   clear_counters(time, resource);
 
-  __gnu_test::test_container<int, random_access_iterator_wrapper> rcon(array, array + length);
+  __gnu_test::test_container<int, random_access_iterator_wrapper> rcon(ary, ary + length);
   start_counters(time, resource);
   for(int i = 0; i < 100; i++)
     search_n(rcon.begin(), rcon.end(), 10, 1);
-- 
2.7.4