diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2011-12-19 23:29:14 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2011-12-19 23:29:14 +0000 |
| commit | 31785b29eea85ed64331c51136c6d20679998c6f (patch) | |
| tree | a81a13876aaf4ca6402ebaabffb8b5a29249a0f9 | |
| parent | eded2736705e1a68bf83d334d8f1ccea25afd290 (diff) | |
| download | gcc-31785b29eea85ed64331c51136c6d20679998c6f.zip gcc-31785b29eea85ed64331c51136c6d20679998c6f.tar.gz gcc-31785b29eea85ed64331c51136c6d20679998c6f.tar.bz2 | |
search_n.cc: Disambiguate local variable.
2011-12-19 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/performance/25_algorithms/search_n.cc: Disambiguate
local variable.
From-SVN: r182510
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | 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); |