[Boost-commit] svn:boost r60272 - trunk/libs/serialization/src

Subject: [Boost-commit] svn:boost r60272 - trunk/libs/serialization/src
From: ramey_at_[hidden]
Date: 2010-03-06 21:43:02

Author: ramey
Date: 2010-03-06 21:43:01 EST (Sat, 06 Mar 2010)
New Revision: 60272
URL: http://svn.boost.org/trac/boost/changeset/60272

Log:
change variable name from "id" to "cid" to work around conflict with apple header
Text files modified: 
   trunk/libs/serialization/src/basic_iarchive.cpp |    10 +++++-----                              
   trunk/libs/serialization/src/basic_oarchive.cpp |     1 +                                       
   2 files changed, 6 insertions(+), 5 deletions(-)

Modified: trunk/libs/serialization/src/basic_iarchive.cpp
==============================================================================
--- trunk/libs/serialization/src/basic_iarchive.cpp	(original)
+++ trunk/libs/serialization/src/basic_iarchive.cpp	2010-03-06 21:43:01 EST (Sat, 06 Mar 2010)
@@ -296,10 +296,10 @@
         <= 
         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 @@
         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

Modified: trunk/libs/serialization/src/basic_oarchive.cpp
==============================================================================
--- trunk/libs/serialization/src/basic_oarchive.cpp	(original)
+++ trunk/libs/serialization/src/basic_oarchive.cpp	2010-03-06 21:43:01 EST (Sat, 06 Mar 2010)
@@ -23,6 +23,7 @@
 #define BOOST_ARCHIVE_SOURCE
 #define BOOST_SERIALIZATION_SOURCE
 
+#include <boost/archive/detail/decl.hpp>
 #include <boost/archive/basic_archive.hpp>
 #include <boost/archive/detail/basic_oserializer.hpp>
 #include <boost/archive/detail/basic_pointer_oserializer.hpp>