boost/circular_buffer
2
0
Fork 0
mirror of https://github.com/boostorg/circular_buffer.git synced 2026-02-10 11:22:14 +00:00
Code Issues Projects Releases Wiki Activity

item_wrapper bug fix

Browse Source 
[SVN r2787]
This commit is contained in:
Jan Gaspar
2005-12-22 00:03:30 +00:00
parent 06fa553274
commit 32bfbced60
3 changed files with 66 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/boost/circular_buffer/base.hpp
View File

@@ -1480,9 +1480,9 @@ private:
pointer p = m_last;
BOOST_TRY {
for (; ii < construct; ++ii, increment(p))
m_alloc.construct(p, *wrapper.get());
m_alloc.construct(p, *wrapper());
for (;ii < n; ++ii, increment(p))
replace(p, *wrapper.get());
replace(p, *wrapper());
} BOOST_CATCH(...) {
size_type constructed = std::min(ii, construct);
m_last = add(m_last, constructed);
@@ -1502,7 +1502,7 @@ private:
decrement(dest);
}
for (; ii < n; ++ii, increment(p))
construct_or_replace(is_uninitialized(p), p, *wrapper.get());
construct_or_replace(is_uninitialized(p), p, *wrapper());
} BOOST_CATCH(...) {
for (p = add(m_last, n - 1); p != dest; decrement(p))
destroy_if_constructed(p);
@@ -1567,9 +1567,9 @@ private:
size_type ii = n;
BOOST_TRY {
for (;ii > construct; --ii, increment(p))
replace(p, *wrapper.get());
replace(p, *wrapper());
for (; ii > 0; --ii, increment(p))
m_alloc.construct(p, *wrapper.get());
m_alloc.construct(p, *wrapper());
} BOOST_CATCH(...) {
size_type constructed = ii < construct ? construct - ii : 0;
m_last = add(m_last, constructed);
@@ -1588,7 +1588,7 @@ private:
increment(dest);
}
for (size_type ii = 0; ii < n; ++ii, increment(dest))
construct_or_replace(is_uninitialized(dest), dest, *wrapper.get());
construct_or_replace(is_uninitialized(dest), dest, *wrapper());
} BOOST_CATCH(...) {
for (src = sub(m_first, n); src != dest; increment(src))
destroy_if_constructed(src);

8
include/boost/circular_buffer/details.hpp
View File

@@ -76,7 +76,7 @@ template <class Iterator>
struct iterator_wrapper {
mutable Iterator m_it;
explicit iterator_wrapper(Iterator it) : m_it(it) {}
Iterator get() const { return m_it++; }
Iterator operator () () const { return m_it++; }
};
/*!
@@ -85,9 +85,9 @@ struct iterator_wrapper {
*/
template <class Pointer, class Value>
struct item_wrapper {
Pointer m_item;
explicit item_wrapper(Value item) : m_item(&item) {}
Pointer get() const { return m_item; }
Value m_item;
explicit item_wrapper(Value item) : m_item(item) {}
Pointer operator () () const { return &m_item; }
};
/*!