Merge from trunk.

[SVN r42243]
This commit is contained in:
Daniel James
2007-12-22 15:36:31 +00:00
parent 1100968547
commit a74f2d445b
2 changed files with 2 additions and 2 deletions

View File

@@ -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);
}

View File

@@ -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));
}