diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2014-11-04 16:54:49 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2014-11-04 16:54:49 +0000 |
| commit | 2acb70965451b3859a0ef1232fd35501e217fd09 (patch) | |
| tree | af94ea318b9406760e1c5904ebefd3a062f7c1b0 | |
| parent | bf42f4fd591f016a02916a7ff624e5d57e8731fa (diff) | |
| download | gcc-2acb70965451b3859a0ef1232fd35501e217fd09.zip gcc-2acb70965451b3859a0ef1232fd35501e217fd09.tar.gz gcc-2acb70965451b3859a0ef1232fd35501e217fd09.tar.bz2 | |
* testsuite/util/testsuite_allocator.h (operator==): Fix recursion.
From-SVN: r217090
| -rw-r--r-- | libstdc++-v3/ChangeLog | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/util/testsuite_allocator.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8cb7675..e11a9a7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -23,6 +23,8 @@ * include/parallel/numeric.h: Do not use default arguments in function template redeclarations (definitions). + * testsuite/util/testsuite_allocator.h (operator==): Fix recursion. + 2014-11-03 Paolo Carlini <paolo.carlini@oracle.com> * include/parallel/algo.h: Do not use default arguments in function diff --git a/libstdc++-v3/testsuite/util/testsuite_allocator.h b/libstdc++-v3/testsuite/util/testsuite_allocator.h index 8edc0a5..dec8d1a 100644 --- a/libstdc++-v3/testsuite/util/testsuite_allocator.h +++ b/libstdc++-v3/testsuite/util/testsuite_allocator.h @@ -209,7 +209,7 @@ namespace __gnu_test { const Alloc1& alloc1 = lhs; const Alloc2& alloc2 = rhs; - return lhs == rhs; + return alloc1 == alloc2; } template<class T1, class Alloc1, class T2, class Alloc2> |