Boost logo

Boost-Commit :

From: ramey_at_[hidden]
Date: 2008-03-31 12:15:11


Author: ramey
Date: 2008-03-31 12:15:10 EDT (Mon, 31 Mar 2008)
New Revision: 43956
URL: http://svn.boost.org/trac/boost/changeset/43956

Log:
fixed name collision for "serialization map"
Text files modified:
   trunk/boost/archive/impl/archive_pointer_iserializer.ipp | 14 +++++++-------
   trunk/boost/archive/impl/archive_pointer_oserializer.ipp | 12 ++++++------
   2 files changed, 13 insertions(+), 13 deletions(-)

Modified: trunk/boost/archive/impl/archive_pointer_iserializer.ipp
==============================================================================
--- trunk/boost/archive/impl/archive_pointer_iserializer.ipp (original)
+++ trunk/boost/archive/impl/archive_pointer_iserializer.ipp 2008-03-31 12:15:10 EDT (Mon, 31 Mar 2008)
@@ -23,7 +23,7 @@
 
 namespace { // anon
     template<class Archive>
- class serializer_map : public basic_serializer_map
+ class iserializer_map : public basic_serializer_map
     {
     };
 }
@@ -35,9 +35,9 @@
 ) :
     basic_pointer_iserializer(eti)
 {
- std::pair<BOOST_DEDUCED_TYPENAME serializer_map<Archive>::iterator, bool> result;
+ std::pair<BOOST_DEDUCED_TYPENAME iserializer_map<Archive>::iterator, bool> result;
     result = serialization::singleton<
- serializer_map<Archive>
+ iserializer_map<Archive>
>::get_mutable_instance().insert(this);
     assert(result.second);
 }
@@ -48,15 +48,15 @@
     const boost::serialization::extended_type_info & eti
 ){
     const basic_serializer_arg bs(eti);
- BOOST_DEDUCED_TYPENAME serializer_map<Archive>::const_iterator it;
+ BOOST_DEDUCED_TYPENAME iserializer_map<Archive>::const_iterator it;
     it = boost::serialization::singleton<
- serializer_map<Archive>
+ iserializer_map<Archive>
>::get_const_instance().find(& bs);
     assert(
         it
         !=
         boost::serialization::singleton<
- serializer_map<Archive>
+ iserializer_map<Archive>
>::get_const_instance().end()
     );
     return static_cast<const basic_pointer_iserializer *>(*it);
@@ -69,7 +69,7 @@
     // on static variables being constructed in a specific sequence
     unsigned int count;
     count = serialization::singleton<
- serializer_map<Archive>
+ iserializer_map<Archive>
>::get_mutable_instance().erase(this);
     assert(count);
 }

Modified: trunk/boost/archive/impl/archive_pointer_oserializer.ipp
==============================================================================
--- trunk/boost/archive/impl/archive_pointer_oserializer.ipp (original)
+++ trunk/boost/archive/impl/archive_pointer_oserializer.ipp 2008-03-31 12:15:10 EDT (Mon, 31 Mar 2008)
@@ -22,7 +22,7 @@
 
 namespace { // anon
     template<class Archive>
- class serializer_map : public basic_serializer_map
+ class oserializer_map : public basic_serializer_map
     {
     };
 }
@@ -35,11 +35,11 @@
     basic_pointer_oserializer(eti)
 {
     std::pair<
- BOOST_DEDUCED_TYPENAME serializer_map<Archive>::iterator,
+ BOOST_DEDUCED_TYPENAME oserializer_map<Archive>::iterator,
         bool
> result;
     result = serialization::singleton<
- serializer_map<Archive>
+ oserializer_map<Archive>
>::get_mutable_instance().insert(this);
     assert(result.second);
 }
@@ -52,13 +52,13 @@
     const basic_serializer_arg bs(eti);
     basic_serializer_map::const_iterator it;
     it = boost::serialization::singleton<
- serializer_map<Archive>
+ oserializer_map<Archive>
>::get_const_instance().find(& bs);
     assert(
         it
         !=
         boost::serialization::singleton<
- serializer_map<Archive>
+ oserializer_map<Archive>
>::get_const_instance().end()
     );
     return static_cast<const basic_pointer_oserializer *>(*it);
@@ -71,7 +71,7 @@
     // on static variables being constructed in a specific sequence
     unsigned int count;
     count = serialization::singleton<
- serializer_map<Archive>
+ oserializer_map<Archive>
>::get_mutable_instance().erase(this);
     assert(count);
 }


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk