boost/serialization
2
0
Fork 0
mirror of https://github.com/boostorg/serialization.git synced 2026-02-01 21:02:07 +00:00
Code Issues Projects Releases Wiki Activity

fix for cycle error

Browse Source
This commit is contained in:
Robert Ramey
2014-01-30 23:07:47 -08:00
parent 4156bd15e6
commit 5244401101
501 changed files with 155968 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/basic_iarchive.cpp
View File

@@ -473,6 +473,10 @@ basic_iarchive_impl::load_pointer(
// save state
serialization::state_saver<object_id_type> w_start(m_moveable_objects.start);
// allocate space on the heap for the object - to be constructed later
t = bpis_ptr->heap_allocation();
BOOST_ASSERT(NULL != t);
if(! tracking){
bpis_ptr->load_object_ptr(ar, t, co.file_version);
}
@@ -489,8 +493,7 @@ basic_iarchive_impl::load_pointer(
serialization::state_saver<object_id_type> w_end(m_moveable_objects.end);
// because the following operation could move the items
// don't use co after this
// add to list of serialized objects so that we can properly handle
// cyclic strucures
object_id_vector.push_back(aobject(t, cid));
@@ -502,8 +505,6 @@ basic_iarchive_impl::load_pointer(
t,
m_pending.version
);
BOOST_ASSERT(NULL != t);
object_id_vector[ui].address = t;
object_id_vector[ui].loaded_as_pointer = true;
}