diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-05-01 15:22:49 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-05-01 15:22:49 +0000 |
| commit | 27ed220e8b7d2efdfbba94b28b2a4b710ce4d0ec (patch) | |
| tree | 5de19f4203fee17b3a62787ca7c53982c5337942 /libstdc++-v3 | |
| parent | e8434b694123da74491ce37a2fadef5ce4372c74 (diff) | |
| download | gcc-27ed220e8b7d2efdfbba94b28b2a4b710ce4d0ec.tar.gz | |
* include/bits/alloc_traits.h (__alloc_rebind): Change parameter name.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222686 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 2 | ||||
| -rw-r--r-- | 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 <jwakely@redhat.com> + * 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<typename _Ptr, typename _Tp> - using __alloc_rebind = typename __alloctr_rebind<_Ptr, _Tp>::__type; + template<typename _Alloc, typename _Tp> + using __alloc_rebind = typename __alloctr_rebind<_Alloc, _Tp>::__type; /** * @brief Uniform interface to all allocator types. |