correct rounding

fix memory leak for constructor failure in load_construct_data
fix another bug in loading pointers

[SVN r86487]
This commit is contained in:
Robert Ramey
2013-10-27 20:50:26 +00:00
parent aad837cf20
commit 599c58825b
10 changed files with 26 additions and 24 deletions

View File

@@ -495,14 +495,16 @@ basic_iarchive_impl::load_pointer(
// cyclic strucures
object_id_vector.push_back(aobject(t, cid));
// remember that that the address of these elements could change
// when we make another call so don't use the address
bpis_ptr->load_object_ptr(
ar,
object_id_vector[ui].address,
co.file_version
ar,
t,
m_pending.version
);
t = object_id_vector[ui].address;
object_id_vector[ui].loaded_as_pointer = true;
BOOST_ASSERT(NULL != t);
object_id_vector[ui].address = t;
object_id_vector[ui].loaded_as_pointer = true;
}
return bpis_ptr;