mirror of
https://github.com/boostorg/circular_buffer.git
synced 2026-02-10 11:22:14 +00:00
small merge
[SVN r2725]
This commit is contained in:
@@ -1282,7 +1282,7 @@ private:
|
||||
//! Specialized assign method.
|
||||
template <class IntegralType>
|
||||
void assign(size_type capacity, IntegralType n, IntegralType item, cb_details::int_tag) {
|
||||
// TODO assign(capacity, static_cast<size_type>(n), item);
|
||||
assign(capacity, static_cast<size_type>(n), item);
|
||||
}
|
||||
|
||||
//! Specialized assign method.
|
||||
|
||||
@@ -264,7 +264,9 @@ public:
|
||||
const allocator_type& alloc = allocator_type())
|
||||
: circular_buffer<T, Alloc>(
|
||||
init_capacity(capacity_ctrl, first, last), first, last, alloc) // TODO
|
||||
, m_capacity_ctrl(capacity_ctrl) {}
|
||||
, m_capacity_ctrl(capacity_ctrl) {
|
||||
|
||||
}
|
||||
|
||||
// Default destructor
|
||||
|
||||
|
||||
Reference in New Issue
Block a user