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

revert previous change

Browse Source 
[SVN r46304]
This commit is contained in:
Robert Ramey
2008-06-10 19:57:29 +00:00
parent b17d9dbd7a
commit b42bfb27f4
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/basic_iarchive.cpp
View File

@@ -224,11 +224,9 @@ basic_iarchive_impl::reset_object_address(
const void * new_address,
const void *old_address
){
object_id_type i;
i = moveable_objects_recent;
// this code handles a couple of situations.
// a) where reset_object_address is applied to an untracked object.
// In such a case the call is really superfluous and it,s really an
// In such a case the call is really superfluous and its really an
// an error. But we don't have access to the types here so we can't
// know that. However, this code will effectively turn this situation
// into a no-op and every thing will work fine - albeat with a small
@@ -238,30 +236,29 @@ basic_iarchive_impl::reset_object_address(
// but the code may work anyway. Naturally, a bad practice on the part
// of the programmer but we can't detect it - as above. So maybe we
// can save a few more people from themselves as above.
//
// note: this scheme fails when an untracked object contains a tracked object!!!
for(; i < moveable_objects_end; ++i){
object_id_type i;
for(i = moveable_objects_recent; i < moveable_objects_end; ++i){
if(old_address == object_id_vector[i].address)
break;
}
for(; i < moveable_objects_end; ++i){
aobject o = this->object_id_vector[i];
// calculate displacement from this level
// warning - pointer arithmetic on void * is in herently non-portable
// but expected to work on all platforms in current usage
if(o.address > old_address){
if(object_id_vector[i].address > old_address){
std::size_t member_displacement
= reinterpret_cast<std::size_t>(o.address)
= reinterpret_cast<std::size_t>(object_id_vector[i].address)
- reinterpret_cast<std::size_t>(old_address);
o.address = reinterpret_cast<void *>(
object_id_vector[i].address = reinterpret_cast<void *>(
reinterpret_cast<std::size_t>(new_address) + member_displacement
);
}
else{
std::size_t member_displacement
= reinterpret_cast<std::size_t>(old_address)
- reinterpret_cast<std::size_t>(o.address);
o.address = reinterpret_cast<void *>(
- reinterpret_cast<std::size_t>(object_id_vector[i].address);
object_id_vector[i].address = reinterpret_cast<void *>(
reinterpret_cast<std::size_t>(new_address) - member_displacement
);
}