mirror of
https://github.com/boostorg/circular_buffer.git
synced 2026-02-11 23:52:22 +00:00
Merge from trunk.
[SVN r42243]
This commit is contained in:
@@ -121,7 +121,7 @@ public:
|
||||
*/
|
||||
void unregister_iterator(const debug_iterator_base* it) const {
|
||||
const debug_iterator_base* previous = 0;
|
||||
for (const debug_iterator_base* p = m_iterators; p != it; previous = p, p = p->next());
|
||||
for (const debug_iterator_base* p = m_iterators; p != it; previous = p, p = p->next()) {}
|
||||
remove(it, previous);
|
||||
}
|
||||
|
||||
|
||||
@@ -1230,7 +1230,7 @@ private:
|
||||
if (new_size > new_capacity) {
|
||||
if (new_capacity == 0)
|
||||
new_capacity = 1;
|
||||
for (; new_size > new_capacity; new_capacity *= 2);
|
||||
for (; new_size > new_capacity; new_capacity *= 2) {}
|
||||
circular_buffer<T, Alloc>::set_capacity(
|
||||
ensure_reserve(new_capacity, new_size));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user