From 508b43539d5aaf29aa2d327a308f7899a7fb9fe1 Mon Sep 17 00:00:00 2001
From: Robert Ramey <ramey@rrsd.com>
Date: Sun, 7 Mar 2010 02:43:01 +0000
Subject: [PATCH] change variable name from "id" to "cid" to work around
 conflict with apple header

[SVN r60272]
---
 src/basic_iarchive.cpp | 10 +++++-----
 src/basic_oarchive.cpp |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/basic_iarchive.cpp b/src/basic_iarchive.cpp
index 861868f8..50da890c 100644
--- a/src/basic_iarchive.cpp
+++ b/src/basic_iarchive.cpp
@@ -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
diff --git a/src/basic_oarchive.cpp b/src/basic_oarchive.cpp
index 41fa48e9..21d4287c 100644
--- a/src/basic_oarchive.cpp
+++ b/src/basic_oarchive.cpp
@@ -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>