boostorg/container
1
0
Fork 1
mirror of https://github.com/boostorg/container.git synced 2025-08-02 14:04:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix MSVC12 warnings of uninitialized variables when using no exception macros.

Browse Source
This commit is contained in:
Ion Gaztañaga
2015-01-17 17:35:05 +01:00
parent 69324174c7
commit 37db43b697
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/boost/container/deque.hpp
View File

@@ -392,9 +392,9 @@ class deque_base
void priv_create_nodes(ptr_alloc_ptr nstart, ptr_alloc_ptr nfinish) void priv_create_nodes(ptr_alloc_ptr nstart, ptr_alloc_ptr nfinish)
{ {
ptr_alloc_ptr cur; ptr_alloc_ptr cur = nstart;
BOOST_TRY { BOOST_TRY {
for (cur = nstart; cur < nfinish; ++cur) for (; cur < nfinish; ++cur)
*cur = this->priv_allocate_node(); *cur = this->priv_allocate_node();
} }
BOOST_CATCH(...){ BOOST_CATCH(...){
@@ -1933,9 +1933,9 @@ class deque : protected deque_base<Allocator>
// but none of the deque's elements have yet been constructed. // but none of the deque's elements have yet been constructed.
void priv_fill_initialize(const value_type& value) void priv_fill_initialize(const value_type& value)
{ {
index_pointer cur; index_pointer cur = this->members_.m_start.m_node;
BOOST_TRY { BOOST_TRY {
for (cur = this->members_.m_start.m_node; cur < this->members_.m_finish.m_node; ++cur){ for ( ; cur < this->members_.m_finish.m_node; ++cur){
boost::container::uninitialized_fill_alloc boost::container::uninitialized_fill_alloc
(this->alloc(), *cur, *cur + this->s_buffer_size(), value); (this->alloc(), *cur, *cur + this->s_buffer_size(), value);
} }
@@ -1973,11 +1973,9 @@ class deque : protected deque_base<Allocator>
n = boost::container::iterator_distance(first, last); n = boost::container::iterator_distance(first, last);
this->priv_initialize_map(n); this->priv_initialize_map(n);
index_pointer cur_node; index_pointer cur_node = this->members_.m_start.m_node;
BOOST_TRY { BOOST_TRY {
for (cur_node = this->members_.m_start.m_node; for (; cur_node < this->members_.m_finish.m_node; ++cur_node) {
cur_node < this->members_.m_finish.m_node;
++cur_node) {
FwdIt mid = first; FwdIt mid = first;
boost::container::iterator_advance(mid, this->s_buffer_size()); boost::container::iterator_advance(mid, this->s_buffer_size());
::boost::container::uninitialized_copy_alloc(this->alloc(), first, mid, *cur_node); ::boost::container::uninitialized_copy_alloc(this->alloc(), first, mid, *cur_node);
@@ -2055,9 +2053,9 @@ class deque : protected deque_base<Allocator>
if (new_nodes + 1 > s){ if (new_nodes + 1 > s){
this->priv_reallocate_map(new_nodes, false); this->priv_reallocate_map(new_nodes, false);
} }
size_type i; size_type i = 1;
BOOST_TRY { BOOST_TRY {
for (i = 1; i <= new_nodes; ++i) for (; i <= new_nodes; ++i)
*(this->members_.m_finish.m_node + i) = this->priv_allocate_node(); *(this->members_.m_finish.m_node + i) = this->priv_allocate_node();
} }
BOOST_CATCH(...) { BOOST_CATCH(...) {