From ff0164b48be37531bde86947ec2fd74cd541708a Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 1 May 2015 16:22:49 +0100 Subject: [PATCH] * include/bits/alloc_traits.h (__alloc_rebind): Change parameter name. From-SVN: r222686 --- libstdc++-v3/ChangeLog | 2 ++ libstdc++-v3/include/bits/alloc_traits.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fa5bcb6332d..cb60e3416ad 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,7 @@ 2015-05-01 Jonathan Wakely + * include/bits/alloc_traits.h (__alloc_rebind): Change parameter name. + * acinclude.m4 (GLIBCXX_ENABLE_FILESYSTEM_TS): Disable for solaris. * configure: Regenerate. diff --git a/libstdc++-v3/include/bits/alloc_traits.h b/libstdc++-v3/include/bits/alloc_traits.h index d6c42ece5dd..12c6c12f187 100644 --- a/libstdc++-v3/include/bits/alloc_traits.h +++ b/libstdc++-v3/include/bits/alloc_traits.h @@ -72,8 +72,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typedef _Alloc<_Tp, _Args...> __type; }; - template - using __alloc_rebind = typename __alloctr_rebind<_Ptr, _Tp>::__type; + template + using __alloc_rebind = typename __alloctr_rebind<_Alloc, _Tp>::__type; /** * @brief Uniform interface to all allocator types. -- 2.30.2