|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r53263 - in trunk: boost/circular_buffer libs/circular_buffer/doc libs/circular_buffer/test
From: jano_gaspar_at_[hidden]
Date: 2009-05-25 18:11:04
Author: jano_gaspar
Date: 2009-05-25 18:11:02 EDT (Mon, 25 May 2009)
New Revision: 53263
URL: http://svn.boost.org/trac/boost/changeset/53263
Log:
circular_buffer: #2785, #3032
Text files modified:
trunk/boost/circular_buffer/base.hpp | 112 +++++++++++++++---------------
trunk/boost/circular_buffer/details.hpp | 6
trunk/boost/circular_buffer/space_optimized.hpp | 4
trunk/libs/circular_buffer/doc/circular_buffer.html | 141 ++++++++++++++++++++-------------------
trunk/libs/circular_buffer/doc/space_optimized.html | 24 +++--
trunk/libs/circular_buffer/test/bounded_buffer_comparison.cpp | 3
6 files changed, 151 insertions(+), 139 deletions(-)
Modified: trunk/boost/circular_buffer/base.hpp
==============================================================================
--- trunk/boost/circular_buffer/base.hpp (original)
+++ trunk/boost/circular_buffer/base.hpp 2009-05-25 18:11:02 EDT (Mon, 25 May 2009)
@@ -998,17 +998,17 @@
//! Create an empty <code>circular_buffer</code> with the specified capacity.
/*!
- \post <code>capacity() == capacity \&\& size() == 0</code>
- \param capacity The maximum number of elements which can be stored in the <code>circular_buffer</code>.
+ \post <code>capacity() == buffer_capacity \&\& size() == 0</code>
+ \param buffer_capacity The maximum number of elements which can be stored in the <code>circular_buffer</code>.
\param alloc The allocator.
\throws "An allocation error" if memory is exhausted (<code>std::bad_alloc</code> if the standard allocator is
used).
\par Complexity
Constant.
*/
- explicit circular_buffer(capacity_type capacity, const allocator_type& alloc = allocator_type())
+ explicit circular_buffer(capacity_type buffer_capacity, const allocator_type& alloc = allocator_type())
: m_size(0), m_alloc(alloc) {
- initialize_buffer(capacity);
+ initialize_buffer(buffer_capacity);
m_first = m_last = m_buff;
}
@@ -1033,10 +1033,10 @@
/*! \brief Create a <code>circular_buffer</code> with the specified capacity and filled with <code>n</code>
copies of <code>item</code>.
- \pre <code>capacity >= n</code>
- \post <code>capacity() == capacity \&\& size() == n \&\& (*this)[0] == item \&\& (*this)[1] == item \&\& ...
- \&\& (*this)[n - 1] == item</code>
- \param capacity The capacity of the created <code>circular_buffer</code>.
+ \pre <code>buffer_capacity >= n</code>
+ \post <code>capacity() == buffer_capacity \&\& size() == n \&\& (*this)[0] == item \&\& (*this)[1] == item
+ \&\& ... \&\& (*this)[n - 1] == item</code>
+ \param buffer_capacity The capacity of the created <code>circular_buffer</code>.
\param n The number of elements the created <code>circular_buffer</code> will be filled with.
\param item The element the created <code>circular_buffer</code> will be filled with.
\param alloc The allocator.
@@ -1046,13 +1046,13 @@
\par Complexity
Linear (in the <code>n</code>).
*/
- circular_buffer(capacity_type capacity, size_type n, param_value_type item,
+ circular_buffer(capacity_type buffer_capacity, size_type n, param_value_type item,
const allocator_type& alloc = allocator_type())
: m_size(n), m_alloc(alloc) {
- BOOST_CB_ASSERT(capacity >= size()); // check for capacity lower than size
- initialize_buffer(capacity, item);
+ BOOST_CB_ASSERT(buffer_capacity >= size()); // check for capacity lower than size
+ initialize_buffer(buffer_capacity, item);
m_first = m_buff;
- m_last = capacity == n ? m_buff : m_buff + n;
+ m_last = buffer_capacity == n ? m_buff : m_buff + n;
}
//! The copy constructor.
@@ -1126,13 +1126,13 @@
\pre Valid range <code>[first, last)</code>.<br>
<code>first</code> and <code>last</code> have to meet the requirements of
<a href="http://www.sgi.com/tech/stl/InputIterator.html">InputIterator</a>.
- \post <code>capacity() == capacity \&\& size() \<= std::distance(first, last) \&\&
- (*this)[0]== *(last - capacity) \&\& (*this)[1] == *(last - capacity + 1) \&\& ... \&\&
- (*this)[capacity - 1] == *(last - 1)</code><br><br>
+ \post <code>capacity() == buffer_capacity \&\& size() \<= std::distance(first, last) \&\&
+ (*this)[0]== *(last - buffer_capacity) \&\& (*this)[1] == *(last - buffer_capacity + 1) \&\& ... \&\&
+ (*this)[buffer_capacity - 1] == *(last - 1)</code><br><br>
If the number of items to be copied from the range <code>[first, last)</code> is greater than the
- specified <code>capacity</code> then only elements from the range <code>[last - capacity, last)</code>
- will be copied.
- \param capacity The capacity of the created <code>circular_buffer</code>.
+ specified <code>buffer_capacity</code> then only elements from the range
+ <code>[last - buffer_capacity, last)</code> will be copied.
+ \param buffer_capacity The capacity of the created <code>circular_buffer</code>.
\param first The beginning of the range to be copied.
\param last The end of the range to be copied.
\param alloc The allocator.
@@ -1145,10 +1145,10 @@
<a href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">RandomAccessIterator</a>).
*/
template <class InputIterator>
- circular_buffer(capacity_type capacity, InputIterator first, InputIterator last,
+ circular_buffer(capacity_type buffer_capacity, InputIterator first, InputIterator last,
const allocator_type& alloc = allocator_type())
: m_alloc(alloc) {
- initialize(capacity, first, last, is_integral<InputIterator>());
+ initialize(buffer_capacity, first, last, is_integral<InputIterator>());
}
#endif // #if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
@@ -1241,9 +1241,9 @@
The capacity of the <code>circular_buffer</code> will be set to the specified value and the content of the
<code>circular_buffer</code> will be removed and replaced with <code>n</code> copies of the <code>item</code>.
\pre <code>capacity >= n</code>
- \post <code>capacity() == capacity \&\& size() == n \&\& (*this)[0] == item \&\& (*this)[1] == item
+ \post <code>capacity() == buffer_capacity \&\& size() == n \&\& (*this)[0] == item \&\& (*this)[1] == item
\&\& ... \&\& (*this) [n - 1] == item </code>
- \param capacity The new capacity.
+ \param buffer_capacity The new capacity.
\param n The number of elements the <code>circular_buffer</code> will be filled with.
\param item The element the <code>circular_buffer</code> will be filled with.
\throws "An allocation error" if memory is exhausted (<code>std::bad_alloc</code> if the standard allocator is
@@ -1260,9 +1260,9 @@
assign(size_type, const_reference)\endlink</code>, <code>assign(InputIterator, InputIterator)</code>,
<code>assign(capacity_type, InputIterator, InputIterator)</code>
*/
- void assign(capacity_type capacity, size_type n, param_value_type item) {
- BOOST_CB_ASSERT(capacity >= n); // check for new capacity lower than n
- assign_n(capacity, n, cb_details::assign_n<param_value_type, allocator_type>(n, item, m_alloc));
+ void assign(capacity_type buffer_capacity, size_type n, param_value_type item) {
+ BOOST_CB_ASSERT(buffer_capacity >= n); // check for new capacity lower than n
+ assign_n(buffer_capacity, n, cb_details::assign_n<param_value_type, allocator_type>(n, item, m_alloc));
}
//! Assign a copy of the range into the <code>circular_buffer</code>.
@@ -1305,13 +1305,13 @@
\pre Valid range <code>[first, last)</code>.<br>
<code>first</code> and <code>last</code> have to meet the requirements of
<a href="http://www.sgi.com/tech/stl/InputIterator.html">InputIterator</a>.
- \post <code>capacity() == capacity \&\& size() \<= std::distance(first, last) \&\&
- (*this)[0]== *(last - capacity) \&\& (*this)[1] == *(last - capacity + 1) \&\& ... \&\&
- (*this)[capacity - 1] == *(last - 1)</code><br><br>
+ \post <code>capacity() == buffer_capacity \&\& size() \<= std::distance(first, last) \&\&
+ (*this)[0]== *(last - buffer_capacity) \&\& (*this)[1] == *(last - buffer_capacity + 1) \&\& ... \&\&
+ (*this)[buffer_capacity - 1] == *(last - 1)</code><br><br>
If the number of items to be copied from the range <code>[first, last)</code> is greater than the
- specified <code>capacity</code> then only elements from the range <code>[last - capacity, last)</code>
- will be copied.
- \param capacity The new capacity.
+ specified <code>buffer_capacity</code> then only elements from the range
+ <code>[last - buffer_capacity, last)</code> will be copied.
+ \param buffer_capacity The new capacity.
\param first The beginning of the range to be copied.
\param last The end of the range to be copied.
\throws "An allocation error" if memory is exhausted (<code>std::bad_alloc</code> if the standard allocator is
@@ -1333,8 +1333,8 @@
<code>assign(InputIterator, InputIterator)</code>
*/
template <class InputIterator>
- void assign(capacity_type capacity, InputIterator first, InputIterator last) {
- assign(capacity, first, last, is_integral<InputIterator>());
+ void assign(capacity_type buffer_capacity, InputIterator first, InputIterator last) {
+ assign(buffer_capacity, first, last, is_integral<InputIterator>());
}
//! Swap the contents of two <code>circular_buffer</code>s.
@@ -2079,14 +2079,14 @@
}
//! Initialize the internal buffer.
- void initialize_buffer(capacity_type capacity) {
- m_buff = allocate(capacity);
- m_end = m_buff + capacity;
+ void initialize_buffer(capacity_type buffer_capacity) {
+ m_buff = allocate(buffer_capacity);
+ m_end = m_buff + buffer_capacity;
}
//! Initialize the internal buffer.
- void initialize_buffer(capacity_type capacity, param_value_type item) {
- initialize_buffer(capacity);
+ void initialize_buffer(capacity_type buffer_capacity, param_value_type item) {
+ initialize_buffer(buffer_capacity);
BOOST_TRY {
cb_details::uninitialized_fill_n_with_alloc(m_buff, size(), item, m_alloc);
} BOOST_CATCH(...) {
@@ -2135,35 +2135,35 @@
//! Specialized initialize method.
template <class IntegralType>
- void initialize(capacity_type capacity, IntegralType n, IntegralType item, const true_type&) {
- BOOST_CB_ASSERT(capacity >= static_cast<size_type>(n)); // check for capacity lower than n
+ void initialize(capacity_type buffer_capacity, IntegralType n, IntegralType item, const true_type&) {
+ BOOST_CB_ASSERT(buffer_capacity >= static_cast<size_type>(n)); // check for capacity lower than n
m_size = static_cast<size_type>(n);
- initialize_buffer(capacity, item);
+ initialize_buffer(buffer_capacity, item);
m_first = m_buff;
- m_last = capacity == size() ? m_buff : m_buff + size();
+ m_last = buffer_capacity == size() ? m_buff : m_buff + size();
}
//! Specialized initialize method.
template <class Iterator>
- void initialize(capacity_type capacity, Iterator first, Iterator last, const false_type&) {
+ void initialize(capacity_type buffer_capacity, Iterator first, Iterator last, const false_type&) {
BOOST_CB_IS_CONVERTIBLE(Iterator, value_type); // check for invalid iterator type
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x581))
- initialize(capacity, first, last, BOOST_ITERATOR_CATEGORY<Iterator>::type());
+ initialize(buffer_capacity, first, last, BOOST_ITERATOR_CATEGORY<Iterator>::type());
#else
- initialize(capacity, first, last, BOOST_DEDUCED_TYPENAME BOOST_ITERATOR_CATEGORY<Iterator>::type());
+ initialize(buffer_capacity, first, last, BOOST_DEDUCED_TYPENAME BOOST_ITERATOR_CATEGORY<Iterator>::type());
#endif
}
//! Specialized initialize method.
template <class InputIterator>
- void initialize(capacity_type capacity,
+ void initialize(capacity_type buffer_capacity,
InputIterator first,
InputIterator last,
const std::input_iterator_tag&) {
- initialize_buffer(capacity);
+ initialize_buffer(buffer_capacity);
m_first = m_last = m_buff;
m_size = 0;
- if (capacity == 0)
+ if (buffer_capacity == 0)
return;
while (first != last && !full()) {
m_alloc.construct(m_last, *first++);
@@ -2179,32 +2179,32 @@
//! Specialized initialize method.
template <class ForwardIterator>
- void initialize(capacity_type capacity,
+ void initialize(capacity_type buffer_capacity,
ForwardIterator first,
ForwardIterator last,
const std::forward_iterator_tag&) {
BOOST_CB_ASSERT(std::distance(first, last) >= 0); // check for wrong range
- initialize(capacity, first, last, std::distance(first, last));
+ initialize(buffer_capacity, first, last, std::distance(first, last));
}
//! Initialize the circular buffer.
template <class ForwardIterator>
- void initialize(capacity_type capacity,
+ void initialize(capacity_type buffer_capacity,
ForwardIterator first,
ForwardIterator last,
size_type distance) {
- initialize_buffer(capacity);
+ initialize_buffer(buffer_capacity);
m_first = m_buff;
- if (distance > capacity) {
- std::advance(first, distance - capacity);
- m_size = capacity;
+ if (distance > buffer_capacity) {
+ std::advance(first, distance - buffer_capacity);
+ m_size = buffer_capacity;
} else {
m_size = distance;
}
BOOST_TRY {
m_last = cb_details::uninitialized_copy_with_alloc(first, last, m_buff, m_alloc);
} BOOST_CATCH(...) {
- deallocate(m_buff, capacity);
+ deallocate(m_buff, buffer_capacity);
BOOST_RETHROW
}
BOOST_CATCH_END
Modified: trunk/boost/circular_buffer/details.hpp
==============================================================================
--- trunk/boost/circular_buffer/details.hpp (original)
+++ trunk/boost/circular_buffer/details.hpp 2009-05-25 18:11:02 EDT (Mon, 25 May 2009)
@@ -146,9 +146,9 @@
public:
//! Constructor.
- capacity_control(Size capacity, Size min_capacity = 0)
- : m_capacity(capacity), m_min_capacity(min_capacity) {
- BOOST_CB_ASSERT(capacity >= min_capacity); // check for capacity lower than min_capacity
+ capacity_control(Size buffer_capacity, Size min_buffer_capacity = 0)
+ : m_capacity(buffer_capacity), m_min_capacity(min_buffer_capacity) {
+ BOOST_CB_ASSERT(buffer_capacity >= min_buffer_capacity); // check for capacity lower than min_capacity
}
// Default copy constructor.
Modified: trunk/boost/circular_buffer/space_optimized.hpp
==============================================================================
--- trunk/boost/circular_buffer/space_optimized.hpp (original)
+++ trunk/boost/circular_buffer/space_optimized.hpp 2009-05-25 18:11:02 EDT (Mon, 25 May 2009)
@@ -1229,8 +1229,8 @@
}
//! Ensure the reserve for possible growth up.
- size_type ensure_reserve(size_type new_capacity, size_type size) const {
- if (size + new_capacity / 5 >= new_capacity)
+ size_type ensure_reserve(size_type new_capacity, size_type buffer_size) const {
+ if (buffer_size + new_capacity / 5 >= new_capacity)
new_capacity *= 2; // ensure at least 20% reserve
if (new_capacity > m_capacity_ctrl)
return m_capacity_ctrl;
Modified: trunk/libs/circular_buffer/doc/circular_buffer.html
==============================================================================
--- trunk/libs/circular_buffer/doc/circular_buffer.html (original)
+++ trunk/libs/circular_buffer/doc/circular_buffer.html 2009-05-25 18:11:02 EDT (Mon, 25 May 2009)
@@ -238,11 +238,11 @@
explicit <a href=
"#classboost_1_1circular__buffer_1e53e744d2f94a2bcbfcdb219a9d93300">circular_buffer</a>(const allocator_type& alloc = allocator_type());
explicit <a href=
-"#classboost_1_1circular__buffer_1862a64cbc6a49376ecbb8321c3b44974">circular_buffer</a>(capacity_type capacity, const allocator_type& alloc = allocator_type());
+"#classboost_1_1circular__buffer_18f1606a26fead923c2cbe068a74e28b6">circular_buffer</a>(capacity_type buffer_capacity, const allocator_type& alloc = allocator_type());
<a href=
"#classboost_1_1circular__buffer_1fdace8f110d5b7a17c02020757f06fe8">circular_buffer</a>(size_type n, const_reference item, const allocator_type& alloc = allocator_type());
<a href=
-"#classboost_1_1circular__buffer_10c7e9286d8270357d7e369b183124239">circular_buffer</a>(capacity_type capacity, size_type n, const_reference item, const allocator_type& alloc = allocator_type());
+"#classboost_1_1circular__buffer_104dc644486d835b56aa479ec48b52230">circular_buffer</a>(capacity_type buffer_capacity, size_type n, const_reference item, const allocator_type& alloc = allocator_type());
<a href=
"#classboost_1_1circular__buffer_1e515d8a951eeb18b8cc930300e7e13bd">circular_buffer</a>(const circular_buffer<T, Alloc>& cb);
template <class InputIterator>
@@ -250,7 +250,7 @@
"#classboost_1_1circular__buffer_1744ec06b06a5a723386b645a29cb8ed2">circular_buffer</a>(InputIterator first, InputIterator last, const allocator_type& alloc = allocator_type());
template <class InputIterator>
<a href=
-"#classboost_1_1circular__buffer_1a64dcad327971194a706d52487151eb7">circular_buffer</a>(capacity_type capacity, InputIterator first, InputIterator last, const allocator_type& alloc = allocator_type());
+"#classboost_1_1circular__buffer_1a851f75f4a85b1a2b1a241904d21503f">circular_buffer</a>(capacity_type buffer_capacity, InputIterator first, InputIterator last, const allocator_type& alloc = allocator_type());
<a href="#classboost_1_1circular__buffer_164250ffbbbdbc62b99e8301fc195b80c">~circular_buffer</a>();
allocator_type <a href=
@@ -303,13 +303,13 @@
void <a href=
"#classboost_1_1circular__buffer_19ba4a81df16f386d31b04b49c82d1ada">assign</a>(size_type n, const_reference item);
void <a href=
-"#classboost_1_1circular__buffer_1aa10b4e4ec1f1c5918931b04b31d43ca">assign</a>(capacity_type capacity, size_type n, const_reference item);
+"#classboost_1_1circular__buffer_1dbebb80a5f38e52a37ec9f3ed765600a">assign</a>(capacity_type buffer_capacity, size_type n, const_reference item);
template <class InputIterator>
void <a href=
"#classboost_1_1circular__buffer_1253302d9bda5d7efbc4a6c311de3790c">assign</a>(InputIterator first, InputIterator last);
template <class InputIterator>
void <a href=
-"#classboost_1_1circular__buffer_11edb80acdf1f7f1df8217d57256e41f6">assign</a>(capacity_type capacity, InputIterator first, InputIterator last);
+"#classboost_1_1circular__buffer_127cab6034beeeb0e11863c8c14d14366">assign</a>(capacity_type buffer_capacity, InputIterator first, InputIterator last);
void <a href=
"#classboost_1_1circular__buffer_1270ab7074c365663a6f18808024fd88b">swap</a>(circular_buffer<T, Alloc>& cb);
void <a href=
@@ -667,6 +667,7 @@
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
#include <boost/thread/thread.hpp>
+ #include <boost/call_traits.hpp>
#include <boost/progress.hpp>
#include <boost/bind.hpp>
@@ -680,7 +681,10 @@
explicit bounded_buffer(size_type capacity) : m_unread(0), m_container(capacity) {}
- void push_front(const value_type& item) {
+ void push_front(call_traits<value_type>::param_type item) {
+ // call_traits<value_type>::param_type represents the "best"
+ // way to pass a parameter of type value_type to a method
+
boost::mutex::scoped_lock lock(m_mutex);
m_not_full.wait(lock, boost::bind(&bounded_buffer<value_type>::is_not_full, this));
m_container.push_front(item);
@@ -712,8 +716,9 @@
};
</pre>
<p>
- The <code>bounded_buffer</code> uses Boost Threads and <a href=
- "../../bind/bind.html">Boost Bind</a> libraries.
+ The <code>bounded_buffer</code> relies on Boost Threads and <a href=
+ "../../bind/bind.html">Boost Bind</a> libraries and call_traits
+ utility.
</p>
<p>
The <code>push_front()</code> method is called by the producer thread in order to insert a new item into the
@@ -744,8 +749,8 @@
For comparison of bounded buffers based on different containers compile and run <a href=
"../test/bounded_buffer_comparison.cpp">bounded_buffer_comparison.cpp</a>. The test should reveal the bounded
buffer based on the <code>circular_buffer</code> is most effective closely followed by the
- <code>std::deque</code> based bounded buffer. (In praxis the result may be different because the test is affected
- by external factors such as immediate CPU load.)
+ <code>std::deque</code> based bounded buffer. (In reality the result may differ sometimes because the test is
+ always affected by external factors such as immediate CPU load.)
</p>
<h2>
<a name="header" id="header">Header Files</a>
@@ -1069,7 +1074,7 @@
</dt>
<dd>
<code><a href=
- "#classboost_1_1circular__buffer_1862a64cbc6a49376ecbb8321c3b44974">circular_buffer(capacity_type,
+ "#classboost_1_1circular__buffer_18f1606a26fead923c2cbe068a74e28b6">circular_buffer(capacity_type,
const allocator_type& alloc)</a></code>, <code><a href=
"#classboost_1_1circular__buffer_161714204ef5172d156e2c7eccd04998f">set_capacity(capacity_type)</a></code>
</dd>
@@ -1078,12 +1083,12 @@
</tr>
<tr>
<td>
- <a id="classboost_1_1circular__buffer_1862a64cbc6a49376ecbb8321c3b44974" name=
- "classboost_1_1circular__buffer_1862a64cbc6a49376ecbb8321c3b44974"></a><code><b>explicit
+ <a id="classboost_1_1circular__buffer_18f1606a26fead923c2cbe068a74e28b6" name=
+ "classboost_1_1circular__buffer_18f1606a26fead923c2cbe068a74e28b6"></a><code><b>explicit
circular_buffer(<a href=
- "#classboost_1_1circular__buffer_1dc642ff2be4db0be1a457810e5d09595">capacity_type</a> capacity, const
- allocator_type& alloc =
- allocator_type());</b></code><br>
+ "#classboost_1_1circular__buffer_1dc642ff2be4db0be1a457810e5d09595">capacity_type</a> buffer_capacity,
+ const allocator_type&
+ alloc = allocator_type());</b></code><br>
<br>
Create an empty <code>circular_buffer</code> with the specified capacity.
<dl>
@@ -1092,7 +1097,7 @@
</dt>
<dd>
<code>capacity() ==
- capacity && <a href=
+ buffer_capacity && <a href=
"#classboost_1_1circular__buffer_15fa0edd153e2591dd6bf070eb663ee32">size()</a> == 0</code>
</dd>
</dl>
@@ -1103,7 +1108,7 @@
<dd>
<dl compact>
<dt>
- <code>capacity</code>
+ <code>buffer_capacity</code>
</dt>
<dd>
The maximum number of elements which can be stored in the <code>circular_buffer</code>.
@@ -1221,10 +1226,10 @@
</tr>
<tr>
<td>
- <a id="classboost_1_1circular__buffer_10c7e9286d8270357d7e369b183124239" name=
- "classboost_1_1circular__buffer_10c7e9286d8270357d7e369b183124239"></a><code><b>circular_buffer(<a href=
- "#classboost_1_1circular__buffer_1dc642ff2be4db0be1a457810e5d09595">capacity_type</a> capacity, <a href=
- "#classboost_1_1circular__buffer_19ba12c0142a21a7d960877c22fa3ea00">size_type</a> n, <a href=
+ <a id="classboost_1_1circular__buffer_104dc644486d835b56aa479ec48b52230" name=
+ "classboost_1_1circular__buffer_104dc644486d835b56aa479ec48b52230"></a><code><b>circular_buffer(<a href=
+ "#classboost_1_1circular__buffer_1dc642ff2be4db0be1a457810e5d09595">capacity_type</a> buffer_capacity,
+ size_type n, <a href=
"#classboost_1_1circular__buffer_1a8397191092f5bacee991b623ca4b910">const_reference</a> item, const
<a href="#classboost_1_1circular__buffer_14e07c6ddfe89debe384e59bed06e7cb7">allocator_type</a>& alloc =
allocator_type());</b></code><br>
@@ -1236,7 +1241,7 @@
<b>Precondition:</b>
</dt>
<dd>
- <code>capacity >= n</code>
+ <code>buffer_capacity >= n</code>
</dd>
</dl>
<dl>
@@ -1245,7 +1250,7 @@
</dt>
<dd>
<code>capacity() ==
- capacity && <a href=
+ buffer_capacity && <a href=
"#classboost_1_1circular__buffer_15fa0edd153e2591dd6bf070eb663ee32">size()</a> == n &&
(*this)[0] == item && (*this)[1] == item && ... && (*this)[n - 1] ==
item</code>
@@ -1258,7 +1263,7 @@
<dd>
<dl compact>
<dt>
- <code>capacity</code>
+ <code>buffer_capacity</code>
</dt>
<dd>
The capacity of the created <code>circular_buffer</code>.
@@ -1464,11 +1469,11 @@
</tr>
<tr>
<td>
- <a id="classboost_1_1circular__buffer_1a64dcad327971194a706d52487151eb7" name=
- "classboost_1_1circular__buffer_1a64dcad327971194a706d52487151eb7"></a> <code><b>template <class
+ <a id="classboost_1_1circular__buffer_1a851f75f4a85b1a2b1a241904d21503f" name=
+ "classboost_1_1circular__buffer_1a851f75f4a85b1a2b1a241904d21503f"></a> <code><b>template <class
InputIterator><br>
circular_buffer(<a href=
- "#classboost_1_1circular__buffer_1dc642ff2be4db0be1a457810e5d09595">capacity_type</a> capacity,
+ "#classboost_1_1circular__buffer_1dc642ff2be4db0be1a457810e5d09595">capacity_type</a> buffer_capacity,
InputIterator first, InputIterator last, const <a href=
"#classboost_1_1circular__buffer_14e07c6ddfe89debe384e59bed06e7cb7">allocator_type</a>& alloc =
allocator_type());</b></code><br>
@@ -1490,14 +1495,15 @@
</dt>
<dd>
<code>capacity() ==
- capacity && <a href=
+ buffer_capacity && <a href=
"#classboost_1_1circular__buffer_15fa0edd153e2591dd6bf070eb663ee32">size()</a> <=
- std::distance(first, last) && (*this)[0]== *(last - capacity) && (*this)[1] == *(last -
- capacity + 1) && ... && (*this)[capacity - 1] == *(last - 1)</code><br>
+ std::distance(first, last) && (*this)[0]== *(last - buffer_capacity) && (*this)[1] ==
+ *(last - buffer_capacity + 1) && ... && (*this)[buffer_capacity - 1] == *(last -
+ 1)</code><br>
<br>
If the number of items to be copied from the range <code>[first, last)</code> is greater than the
- specified <code>capacity</code> then only elements from the range <code>[last - capacity, last)</code>
- will be copied.
+ specified <code>buffer_capacity</code> then only elements from the range <code>[last - buffer_capacity,
+ last)</code> will be copied.
</dd>
</dl>
<dl>
@@ -1507,7 +1513,7 @@
<dd>
<dl compact>
<dt>
- <code>capacity</code>
+ <code>buffer_capacity</code>
</dt>
<dd>
The capacity of the created <code>circular_buffer</code>.
@@ -2491,7 +2497,7 @@
<b>See Also:</b>
</dt>
<dd>
- <code>operator[]</code>
+ <code>operator[]</code>
</dd>
</dl>
</td>
@@ -3420,7 +3426,7 @@
<b>Complexity:</b>
</dt>
<dd>
- Linear (in <code>std::min(m, n)</code>); constant if the <code>circular_buffer</code> is full.
+ Linear (in <code>(std::min)(m, n)</code>); constant if the <code>circular_buffer</code> is full.
</dd>
</dl>
<dl>
@@ -4274,11 +4280,11 @@
<dd>
<code><a href="#classboost_1_1circular__buffer_19ba4a81df16f386d31b04b49c82d1ada">assign(size_type,
const_reference)</a></code>, <code><a href=
- "#classboost_1_1circular__buffer_1aa10b4e4ec1f1c5918931b04b31d43ca">assign(capacity_type, size_type,
+ "#classboost_1_1circular__buffer_1dbebb80a5f38e52a37ec9f3ed765600a">assign(capacity_type, size_type,
const_reference)</a></code>, <code><a href=
"#classboost_1_1circular__buffer_1253302d9bda5d7efbc4a6c311de3790c">assign(InputIterator,
InputIterator)</a></code>, <code><a href=
- "#classboost_1_1circular__buffer_11edb80acdf1f7f1df8217d57256e41f6">assign(capacity_type,
+ "#classboost_1_1circular__buffer_127cab6034beeeb0e11863c8c14d14366">assign(capacity_type,
InputIterator, InputIterator)</a></code>
</dd>
</dl>
@@ -4375,12 +4381,12 @@
<b>See Also:</b>
</dt>
<dd>
- <code>operator=</code>, <code><a href=
- "#classboost_1_1circular__buffer_1aa10b4e4ec1f1c5918931b04b31d43ca">assign(capacity_type, size_type,
- const_reference)</a></code>, <code><a href=
+ <code>operator=</code>,
+ <code><a href="#classboost_1_1circular__buffer_1dbebb80a5f38e52a37ec9f3ed765600a">assign(capacity_type,
+ size_type, const_reference)</a></code>, <code><a href=
"#classboost_1_1circular__buffer_1253302d9bda5d7efbc4a6c311de3790c">assign(InputIterator,
InputIterator)</a></code>, <code><a href=
- "#classboost_1_1circular__buffer_11edb80acdf1f7f1df8217d57256e41f6">assign(capacity_type,
+ "#classboost_1_1circular__buffer_127cab6034beeeb0e11863c8c14d14366">assign(capacity_type,
InputIterator, InputIterator)</a></code>
</dd>
</dl>
@@ -4388,10 +4394,10 @@
</tr>
<tr>
<td>
- <a id="classboost_1_1circular__buffer_1aa10b4e4ec1f1c5918931b04b31d43ca" name=
- "classboost_1_1circular__buffer_1aa10b4e4ec1f1c5918931b04b31d43ca"></a><code><b>void assign(<a href=
- "#classboost_1_1circular__buffer_1dc642ff2be4db0be1a457810e5d09595">capacity_type</a> capacity, <a href=
- "#classboost_1_1circular__buffer_19ba12c0142a21a7d960877c22fa3ea00">size_type</a> n, <a href=
+ <a id="classboost_1_1circular__buffer_1dbebb80a5f38e52a37ec9f3ed765600a" name=
+ "classboost_1_1circular__buffer_1dbebb80a5f38e52a37ec9f3ed765600a"></a><code><b>void assign(<a href=
+ "#classboost_1_1circular__buffer_1dc642ff2be4db0be1a457810e5d09595">capacity_type</a> buffer_capacity,
+ size_type n, <a href=
"#classboost_1_1circular__buffer_1a8397191092f5bacee991b623ca4b910">const_reference</a>
item);</b></code><br>
<br>
@@ -4415,7 +4421,7 @@
</dt>
<dd>
<code>capacity() ==
- capacity && <a href=
+ buffer_capacity && <a href=
"#classboost_1_1circular__buffer_15fa0edd153e2591dd6bf070eb663ee32">size()</a> == n &&
(*this)[0] == item && (*this)[1] == item && ... && (*this) [n - 1] ==
item</code>
@@ -4428,7 +4434,7 @@
<dd>
<dl compact>
<dt>
- <code>capacity</code>
+ <code>buffer_capacity</code>
</dt>
<dd>
The new capacity.
@@ -4498,12 +4504,12 @@
<b>See Also:</b>
</dt>
<dd>
- <code>operator=</code>, <code><a href=
- "#classboost_1_1circular__buffer_19ba4a81df16f386d31b04b49c82d1ada">assign(size_type,
+ <code>operator=</code>,
+ <code><a href="#classboost_1_1circular__buffer_19ba4a81df16f386d31b04b49c82d1ada">assign(size_type,
const_reference)</a></code>, <code><a href=
"#classboost_1_1circular__buffer_1253302d9bda5d7efbc4a6c311de3790c">assign(InputIterator,
InputIterator)</a></code>, <code><a href=
- "#classboost_1_1circular__buffer_11edb80acdf1f7f1df8217d57256e41f6">assign(capacity_type,
+ "#classboost_1_1circular__buffer_127cab6034beeeb0e11863c8c14d14366">assign(capacity_type,
InputIterator, InputIterator)</a></code>
</dd>
</dl>
@@ -4610,12 +4616,12 @@
<b>See Also:</b>
</dt>
<dd>
- <code>operator=</code>, <code><a href=
- "#classboost_1_1circular__buffer_19ba4a81df16f386d31b04b49c82d1ada">assign(size_type,
+ <code>operator=</code>,
+ <code><a href="#classboost_1_1circular__buffer_19ba4a81df16f386d31b04b49c82d1ada">assign(size_type,
const_reference)</a></code>, <code><a href=
- "#classboost_1_1circular__buffer_1aa10b4e4ec1f1c5918931b04b31d43ca">assign(capacity_type, size_type,
+ "#classboost_1_1circular__buffer_1dbebb80a5f38e52a37ec9f3ed765600a">assign(capacity_type, size_type,
const_reference)</a></code>, <code><a href=
- "#classboost_1_1circular__buffer_11edb80acdf1f7f1df8217d57256e41f6">assign(capacity_type,
+ "#classboost_1_1circular__buffer_127cab6034beeeb0e11863c8c14d14366">assign(capacity_type,
InputIterator, InputIterator)</a></code>
</dd>
</dl>
@@ -4623,11 +4629,11 @@
</tr>
<tr>
<td>
- <a id="classboost_1_1circular__buffer_11edb80acdf1f7f1df8217d57256e41f6" name=
- "classboost_1_1circular__buffer_11edb80acdf1f7f1df8217d57256e41f6"></a> <code><b>template <class
+ <a id="classboost_1_1circular__buffer_127cab6034beeeb0e11863c8c14d14366" name=
+ "classboost_1_1circular__buffer_127cab6034beeeb0e11863c8c14d14366"></a> <code><b>template <class
InputIterator><br>
void assign(<a href=
- "#classboost_1_1circular__buffer_1dc642ff2be4db0be1a457810e5d09595">capacity_type</a> capacity,
+ "#classboost_1_1circular__buffer_1dc642ff2be4db0be1a457810e5d09595">capacity_type</a> buffer_capacity,
InputIterator first, InputIterator last);</b></code><br>
<br>
Assign a copy of the range into the <code>circular_buffer</code> specifying the capacity.
@@ -4652,14 +4658,15 @@
</dt>
<dd>
<code>capacity() ==
- capacity && <a href=
+ buffer_capacity && <a href=
"#classboost_1_1circular__buffer_15fa0edd153e2591dd6bf070eb663ee32">size()</a> <=
- std::distance(first, last) && (*this)[0]== *(last - capacity) && (*this)[1] == *(last -
- capacity + 1) && ... && (*this)[capacity - 1] == *(last - 1)</code><br>
+ std::distance(first, last) && (*this)[0]== *(last - buffer_capacity) && (*this)[1] ==
+ *(last - buffer_capacity + 1) && ... && (*this)[buffer_capacity - 1] == *(last -
+ 1)</code><br>
<br>
If the number of items to be copied from the range <code>[first, last)</code> is greater than the
- specified <code>capacity</code> then only elements from the range <code>[last - capacity, last)</code>
- will be copied.
+ specified <code>buffer_capacity</code> then only elements from the range <code>[last - buffer_capacity,
+ last)</code> will be copied.
</dd>
</dl>
<dl>
@@ -4669,7 +4676,7 @@
<dd>
<dl compact>
<dt>
- <code>capacity</code>
+ <code>buffer_capacity</code>
</dt>
<dd>
The new capacity.
@@ -4741,10 +4748,10 @@
<b>See Also:</b>
</dt>
<dd>
- <code>operator=</code>, <code><a href=
- "#classboost_1_1circular__buffer_19ba4a81df16f386d31b04b49c82d1ada">assign(size_type,
+ <code>operator=</code>,
+ <code><a href="#classboost_1_1circular__buffer_19ba4a81df16f386d31b04b49c82d1ada">assign(size_type,
const_reference)</a></code>, <code><a href=
- "#classboost_1_1circular__buffer_1aa10b4e4ec1f1c5918931b04b31d43ca">assign(capacity_type, size_type,
+ "#classboost_1_1circular__buffer_1dbebb80a5f38e52a37ec9f3ed765600a">assign(capacity_type, size_type,
const_reference)</a></code>, <code><a href=
"#classboost_1_1circular__buffer_1253302d9bda5d7efbc4a6c311de3790c">assign(InputIterator,
InputIterator)</a></code>
Modified: trunk/libs/circular_buffer/doc/space_optimized.html
Modified: trunk/libs/circular_buffer/test/bounded_buffer_comparison.cpp
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk
==============================================================================
--- trunk/libs/circular_buffer/doc/space_optimized.html (original)
+++ trunk/libs/circular_buffer/doc/space_optimized.html 2009-05-25 18:11:02 EDT (Mon, 25 May 2009)
@@ -1304,13 +1304,9 @@
<dd>
To explicitly clear the extra allocated memory use the <b>shrink-to-fit</b> technique:<br>
<br>
- <code><a href=
- "circular_buffer.html#namespaceboost">boost</a>::circular_buffer_space_optimized<int>
- cb(1000);<br>
+ <code>boost::circular_buffer_space_optimized<int> cb(1000);<br>
...<br>
- <a href=
- "circular_buffer.html#namespaceboost">boost</a>::circular_buffer_space_optimized<int>(cb).swap(cb);</code><br>
-
+ boost::circular_buffer_space_optimized<int>(cb).swap(cb);</code><br>
<br>
For more information about the shrink-to-fit technique in STL see <a href=
"http://www.gotw.ca/gotw/054.htm">http://www.gotw.ca/gotw/054.htm>.
@@ -1849,7 +1845,9 @@
<b>See Also:</b>
</dt>
<dd>
- <code>operator=</code>, <code><a href=
+ <code><a href=
+ "#classboost_1_1circular__buffer__space__optimized_177e35432c5e69b7a16ef7d937950e7a8">operator=</a></code>,
+ <code><a href=
"#classboost_1_1circular__buffer__space__optimized_1108055ae3f6b1635e1428b0455902cbf">assign(capacity_type,
size_type, const_reference)</a></code>, <code><a href=
"#classboost_1_1circular__buffer__space__optimized_1417de2c2419c44d83a92c463762df5fb">assign(InputIterator,
@@ -1979,7 +1977,9 @@
<b>See Also:</b>
</dt>
<dd>
- <code>operator=</code>, <code><a href=
+ <code><a href=
+ "#classboost_1_1circular__buffer__space__optimized_177e35432c5e69b7a16ef7d937950e7a8">operator=</a></code>,
+ <code><a href=
"#classboost_1_1circular__buffer__space__optimized_17ca4fda9526d0dad99706763c3b2d9f1">assign(size_type,
const_reference)</a></code>, <code><a href=
"#classboost_1_1circular__buffer__space__optimized_1417de2c2419c44d83a92c463762df5fb">assign(InputIterator,
@@ -2097,7 +2097,9 @@
<b>See Also:</b>
</dt>
<dd>
- <code>operator=</code>, <code><a href=
+ <code><a href=
+ "#classboost_1_1circular__buffer__space__optimized_177e35432c5e69b7a16ef7d937950e7a8">operator=</a></code>,
+ <code><a href=
"#classboost_1_1circular__buffer__space__optimized_17ca4fda9526d0dad99706763c3b2d9f1">assign(size_type,
const_reference)</a></code>, <code><a href=
"#classboost_1_1circular__buffer__space__optimized_1108055ae3f6b1635e1428b0455902cbf">assign(capacity_type,
@@ -2233,7 +2235,9 @@
<b>See Also:</b>
</dt>
<dd>
- <code>operator=</code>, <code><a href=
+ <code><a href=
+ "#classboost_1_1circular__buffer__space__optimized_177e35432c5e69b7a16ef7d937950e7a8">operator=</a></code>,
+ <code><a href=
"#classboost_1_1circular__buffer__space__optimized_17ca4fda9526d0dad99706763c3b2d9f1">assign(size_type,
const_reference)</a></code>, <code><a href=
"#classboost_1_1circular__buffer__space__optimized_1108055ae3f6b1635e1428b0455902cbf">assign(capacity_type,
==============================================================================
--- trunk/libs/circular_buffer/test/bounded_buffer_comparison.cpp (original)
+++ trunk/libs/circular_buffer/test/bounded_buffer_comparison.cpp 2009-05-25 18:11:02 EDT (Mon, 25 May 2009)
@@ -12,6 +12,7 @@
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
#include <boost/thread/thread.hpp>
+#include <boost/call_traits.hpp>
#include <boost/progress.hpp>
#include <boost/bind.hpp>
#include <deque>
@@ -32,7 +33,7 @@
explicit bounded_buffer(size_type capacity) : m_unread(0), m_container(capacity) {}
- void push_front(const value_type& item) {
+ void push_front(call_traits<value_type>::param_type item) {
boost::mutex::scoped_lock lock(m_mutex);
m_not_full.wait(lock, boost::bind(&bounded_buffer<value_type>::is_not_full, this));
m_container.push_front(item);