boostorg/container
1
0
Fork 1
mirror of https://github.com/boostorg/container.git synced 2025-08-02 22:14:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed error with input_iterator insertion

Browse Source 
[SVN r74259]
This commit is contained in:
Ion Gaztañaga
2011-09-06 11:43:41 +00:00
parent ceb1507318
commit 5247083184
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/boost/container/vector.hpp
View File

@@ -1320,12 +1320,20 @@ class vector : private containers_detail::vector_alloc_holder<A>
} }
template <class FwdIt> template <class FwdIt>
void priv_range_insert(pointer pos, FwdIt first, FwdIt last, std::forward_iterator_tag) void priv_range_insert(const_iterator pos, FwdIt first, FwdIt last, std::forward_iterator_tag)
{ {
if(first != last){ if(first != last){
const size_type n = std::distance(first, last); const size_type n = std::distance(first, last);
containers_detail::advanced_insert_aux_proxy<T, FwdIt, T*> proxy(first, last); containers_detail::advanced_insert_aux_proxy<T, FwdIt, T*> proxy(first, last);
priv_range_insert(pos, n, proxy); priv_range_insert(pos.get_ptr(), n, proxy);
}
}
template <class InIt>
void priv_range_insert(const_iterator pos, InIt first, InIt last, std::input_iterator_tag)
{
for(;first != last; ++first){
this->emplace(pos, *first);
} }
} }
@@ -1755,14 +1763,6 @@ class vector : private containers_detail::vector_alloc_holder<A>
} }
} }
template <class InIt>
void priv_range_insert(const_iterator pos, InIt first, InIt last, std::input_iterator_tag)
{
for(;first != last; ++first){
this->insert(pos, ::boost::move(value_type(*first)));
}
}
template <class InIt> template <class InIt>
void priv_assign_aux(InIt first, InIt last, std::input_iterator_tag) void priv_assign_aux(InIt first, InIt last, std::input_iterator_tag)
{ {
@@ -1925,7 +1925,7 @@ class vector : private containers_detail::vector_alloc_holder<A>
{ {
//Dispatch depending on integer/iterator //Dispatch depending on integer/iterator
typedef typename std::iterator_traits<InIt>::iterator_category ItCat; typedef typename std::iterator_traits<InIt>::iterator_category ItCat;
this->priv_range_insert(pos.get_ptr(), first, last, ItCat()); this->priv_range_insert(pos, first, last, ItCat());
} }
void priv_check_range(size_type n) const void priv_check_range(size_type n) const