diff options
Diffstat (limited to 'libstdc++-v3')
| -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 8cb7675f6a5..e11a9a752e3 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 8edc0a5ad78..dec8d1a965d 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> |