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

change variable name from "id" to "cid" to work around conflict with apple header

Browse Source 
[SVN r60272]
This commit is contained in:
Robert Ramey
2010-03-07 02:43:01 +00:00
parent 740211876a
commit 508b43539d
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/basic_iarchive.cpp
View File

@@ -296,10 +296,10 @@ basic_iarchive_impl::register_type(
<=
boost::integer_traits<class_id_type>::const_max
);
class_id_type id(static_cast<class_id_type>(
class_id_type cid(static_cast<class_id_type>(
cobject_info_set.size()
));
cobject_type co(id, bis);
cobject_type co(cid, bis);
std::pair<cobject_info_set_type::const_iterator, bool>
result = cobject_info_set.insert(co);
@@ -307,12 +307,12 @@ basic_iarchive_impl::register_type(
cobject_id_vector.push_back(cobject_id(bis));
assert(cobject_info_set.size() == cobject_id_vector.size());
}
id = result.first->m_class_id;
cid = result.first->m_class_id;
// borland complains without this minor hack
const int tid = id;
const int tid = cid;
cobject_id & coid = cobject_id_vector[tid];
coid.bpis_ptr = bis.get_bpis_ptr();
return id;
return cid;
}
void