small merge

[SVN r2725]
This commit is contained in:
Jan Gaspar
2005-10-02 22:18:03 +00:00
parent ac9de396bd
commit b5fe6de577
2 changed files with 4 additions and 2 deletions

View File

@@ -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.

View File

@@ -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