+2012-10-31 Jonathan Wakely <jwakely.gcc@gmail.com>
+
+ * include/bits/forward_list.h (forward_list): Adjust comments.
+ (forward_list(const forward_list&, const _Alloc&)): Use
+ _M_range_initialize to copy elements.
+ (forward_list(forward_list&&, const _Alloc&)): Add exception
+ specification.
+ (_Fwd_list_base(const _Fwd_list_base&, const _Node_alloc_type&)):
+ Remove.
+ * include/bits/forward_list.tcc (_Fwd_list_base(const _Fwd_list_base&,
+ const _Node_alloc_type&)): Remove.
+ (_Fwd_list_base(_Fwd_list_base&&, const _Node_alloc_type&)): Fix
+ memory leak when allocators are not equal.
+
2012-10-29 Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/55123
2012-10-09 Daniel Krugler <daniel.kruegler@gmail.com>
- * include/std/type_traits (common_time): Provide "SFINAE-friendly"
+ * include/std/type_traits (common_type): Provide "SFINAE-friendly"
implementation.
(__success_type, __failure_type): Fix.
* include/std/chrono (common_type): Likewise for the chrono::time_point
_Fwd_list_base(const _Node_alloc_type& __a)
: _M_impl(__a) { }
- _Fwd_list_base(const _Fwd_list_base& __lst, const _Node_alloc_type& __a);
-
_Fwd_list_base(_Fwd_list_base&& __lst, const _Node_alloc_type& __a);
_Fwd_list_base(_Fwd_list_base&& __lst)
* Also unlike the other standard containers, std::forward_list provides
* specialized algorithms %unique to linked lists, such as
* splicing, sorting, and in-place reversal.
- *
- * A couple points on memory allocation for forward_list<Tp>:
- *
- * First, we never actually allocate a Tp, we allocate
- * Fwd_list_node<Tp>'s and trust [20.1.5]/4 to DTRT. This is to ensure
- * that after elements from %forward_list<X,Alloc1> are spliced into
- * %forward_list<X,Alloc2>, destroying the memory of the second %list is a
- * valid operation, i.e., Alloc1 giveth and Alloc2 taketh away.
*/
template<typename _Tp, typename _Alloc = allocator<_Tp> >
class forward_list : private _Fwd_list_base<_Tp, _Alloc>
typedef std::ptrdiff_t difference_type;
typedef _Alloc allocator_type;
- // 23.2.3.1 construct/copy/destroy:
+ // 23.3.4.2 construct/copy/destroy:
/**
* @brief Creates a %forward_list with no elements.
* @param __al An allocator object.
*/
forward_list(const forward_list& __list, const _Alloc& __al)
- : _Base(__list, _Node_alloc_type(__al))
- { }
+ : _Base(_Node_alloc_type(__al))
+ { _M_range_initialize(__list.begin(), __list.end()); }
/**
* @brief Move constructor with allocator argument.
* @param __al An allocator object.
*/
forward_list(forward_list&& __list, const _Alloc& __al)
+ noexcept(_Node_alloc_traits::_S_always_equal())
: _Base(std::move(__list), _Node_alloc_type(__al))
{ }
/**
* @brief The %forward_list copy constructor.
* @param __list A %forward_list of identical element and allocator
- * types.
+ * types.
*/
forward_list(const forward_list& __list)
: _Base(_Node_alloc_traits::_S_select_on_copy(
/**
* @brief The %forward_list move constructor.
* @param __list A %forward_list of identical element and allocator
- * types.
+ * types.
*
* The newly-created %forward_list contains the exact contents of @a
- * forward_list. The contents of @a __list are a valid, but unspecified
+ * __list. The contents of @a __list are a valid, but unspecified
* %forward_list.
*/
forward_list(forward_list&& __list) noexcept
get_allocator() const noexcept
{ return allocator_type(this->_M_get_Node_allocator()); }
- // 23.2.3.2 iterators:
+ // 23.3.4.3 iterators:
/**
* Returns a read/write iterator that points before the first element
max_size() const noexcept
{ return _Node_alloc_traits::max_size(this->_M_get_Node_allocator()); }
- // 23.2.3.3 element access:
+ // 23.3.4.4 element access:
/**
* Returns a read/write reference to the data at the first
return __front->_M_value;
}
- // 23.2.3.4 modifiers:
+ // 23.3.4.5 modifiers:
/**
* @brief Constructs object in %forward_list at the front of the
clear() noexcept
{ this->_M_erase_after(&this->_M_impl._M_head, 0); }
- // 23.2.3.5 forward_list operations:
+ // 23.3.4.6 forward_list operations:
/**
* @brief Insert contents of another %forward_list.
{ this->_M_impl._M_head._M_reverse_after(); }
private:
- // Called by the range constructor to implement [23.1.1]/9
+ // Called by the range constructor to implement [23.3.4.2]/9
template<typename _InputIterator>
void
_M_range_initialize(_InputIterator __first, _InputIterator __last);
{
_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
- template<typename _Tp, typename _Alloc>
- _Fwd_list_base<_Tp, _Alloc>::
- _Fwd_list_base(const _Fwd_list_base& __lst, const _Node_alloc_type& __a)
- : _M_impl(__a)
- {
- this->_M_impl._M_head._M_next = 0;
- _Fwd_list_node_base* __to = &this->_M_impl._M_head;
- _Node* __curr = static_cast<_Node*>(__lst._M_impl._M_head._M_next);
-
- while (__curr)
- {
- __to->_M_next = _M_create_node(__curr->_M_value);
- __to = __to->_M_next;
- __curr = static_cast<_Node*>(__curr->_M_next);
- }
- }
-
template<typename _Tp, typename _Alloc>
_Fwd_list_base<_Tp, _Alloc>::
_Fwd_list_base(_Fwd_list_base&& __lst, const _Node_alloc_type& __a)
: _M_impl(__a)
{
if (__lst._M_get_Node_allocator() == __a)
- this->_M_impl._M_head._M_next = __lst._M_impl._M_head._M_next;
+ {
+ this->_M_impl._M_head._M_next = __lst._M_impl._M_head._M_next;
+ __lst._M_impl._M_head._M_next = 0;
+ }
else
{
this->_M_impl._M_head._M_next = 0;
__curr = static_cast<_Node*>(__curr->_M_next);
}
}
- __lst._M_impl._M_head._M_next = 0;
}
template<typename _Tp, typename _Alloc>
return __last;
}
- // Called by the range constructor to implement [23.1.1]/9
+ // Called by the range constructor to implement [23.3.4.2]/9
template<typename _Tp, typename _Alloc>
template<typename _InputIterator>
void
projects / thirdparty / gcc.git / commitdiff
