diff options
| author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2013-04-07 15:42:27 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2013-04-07 16:42:27 +0100 |
| commit | 7db567cd08c715e243aa124765bc1e3374f83593 (patch) | |
| tree | 3f4d3a542804f68859b9173bab5b18ed8e87a2f7 | |
| parent | 82b12c4b24d52b38cc4d538cc0e978002ead07e2 (diff) | |
| download | gcc-7db567cd08c715e243aa124765bc1e3374f83593.zip gcc-7db567cd08c715e243aa124765bc1e3374f83593.tar.gz gcc-7db567cd08c715e243aa124765bc1e3374f83593.tar.bz2 | |
forward_list.h: Only include required headers.
* include/bits/forward_list.h: Only include required headers.
(forward_list::reference): Define directly, not using __alloc_traits.
(forward_list::const_reference): Likewise.
From-SVN: r197552
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/forward_list.h | 13 |
2 files changed, 14 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 64e5383..fd0d09c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2013-04-07 Jonathan Wakely <jwakely.gcc@gmail.com> + + * include/bits/forward_list.h: Only include required headers. + (forward_list::reference): Define directly, not using __alloc_traits. + (forward_list::const_reference): Likewise. + 2013-04-07 François Dumont <fdumont@gcc.gnu.org> * include/std/functional (_Derives_from_unary_function): Remove. diff --git a/libstdc++-v3/include/bits/forward_list.h b/libstdc++-v3/include/bits/forward_list.h index 608d678..8270c4e 100644 --- a/libstdc++-v3/include/bits/forward_list.h +++ b/libstdc++-v3/include/bits/forward_list.h @@ -32,10 +32,13 @@ #pragma GCC system_header -#include <memory> -#if __cplusplus >= 201103L #include <initializer_list> -#endif +#include <bits/stl_iterator_base_types.h> +#include <bits/stl_iterator.h> +#include <bits/stl_algobase.h> +#include <bits/stl_function.h> +#include <bits/allocator.h> +#include <ext/alloc_traits.h> namespace std _GLIBCXX_VISIBILITY(default) { @@ -421,8 +424,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER typedef _Tp value_type; typedef typename _Alloc_traits::pointer pointer; typedef typename _Alloc_traits::const_pointer const_pointer; - typedef typename _Alloc_traits::reference reference; - typedef typename _Alloc_traits::const_reference const_reference; + typedef value_type& reference; + typedef const value_type& const_reference; typedef _Fwd_list_iterator<_Tp> iterator; typedef _Fwd_list_const_iterator<_Tp> const_iterator; |