Subject: [Boost-commit] svn:boost r66123 - in trunk/boost: archive/impl serialization
From: admin_at_[hidden]
Date: 2010-10-20 16:50:54
Author: wash
Date: 2010-10-20 16:50:52 EDT (Wed, 20 Oct 2010)
New Revision: 66123
URL: http://svn.boost.org/trac/boost/changeset/66123
Log:
Fixes for building Serialization with mingw.
Text files modified:
trunk/boost/archive/impl/archive_serializer_map.ipp | 10 +++++-----
trunk/boost/archive/impl/basic_binary_iarchive.ipp | 2 +-
trunk/boost/serialization/export.hpp | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
Modified: trunk/boost/archive/impl/archive_serializer_map.ipp
==============================================================================
--- trunk/boost/archive/impl/archive_serializer_map.ipp (original)
+++ trunk/boost/archive/impl/archive_serializer_map.ipp 2010-10-20 16:50:52 EDT (Wed, 20 Oct 2010)
@@ -26,7 +26,7 @@
# pragma warning(disable : 4511 4512)
#endif
-namespace { // anon
+namespace extra_detail { // anon
template<class Archive>
class map : public basic_serializer_map
{};
@@ -40,7 +40,7 @@
BOOST_ARCHIVE_OR_WARCHIVE_DECL(bool)
archive_serializer_map<Archive>::insert(const basic_serializer * bs){
return boost::serialization::singleton<
- boost::archive::detail::map<Archive>
+ extra_detail::map<Archive>
>::get_mutable_instance().insert(bs);
}
@@ -48,11 +48,11 @@
BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
archive_serializer_map<Archive>::erase(const basic_serializer * bs){
if(boost::serialization::singleton<
- boost::archive::detail::map<Archive>
+ extra_detail::map<Archive>
>::is_destroyed())
return;
boost::serialization::singleton<
- boost::archive::detail::map<Archive>
+ extra_detail::map<Archive>
>::get_mutable_instance().erase(bs);
}
@@ -62,7 +62,7 @@
const boost::serialization::extended_type_info & eti
) {
return boost::serialization::singleton<
- boost::archive::detail::map<Archive>
+ extra_detail::map<Archive>
>::get_const_instance().find(eti);
}
Modified: trunk/boost/archive/impl/basic_binary_iarchive.ipp
==============================================================================
--- trunk/boost/archive/impl/basic_binary_iarchive.ipp (original)
+++ trunk/boost/archive/impl/basic_binary_iarchive.ipp 2010-10-20 16:50:52 EDT (Wed, 20 Oct 2010)
@@ -103,7 +103,7 @@
// version 8+ followed by a zero
this->This()->m_sb.sbumpc();
}
- #else defined(BOOST_BIG_ENDIAN)
+ #elif defined(BOOST_BIG_ENDIAN)
if(v == 0)
v = this->This()->m_sb.sbumpc();
#endif
Modified: trunk/boost/serialization/export.hpp
==============================================================================
--- trunk/boost/serialization/export.hpp (original)
+++ trunk/boost/serialization/export.hpp 2010-10-20 16:50:52 EDT (Wed, 20 Oct 2010)
@@ -120,7 +120,7 @@
// This was made this way so that export.hpp could be included
// in other headers. This is still under study.
-namespace {
+namespace extra_detail {
template<class T>
struct guid_initializer
@@ -156,7 +156,7 @@
namespace boost { \
namespace archive { \
namespace detail { \
- namespace { \
+ namespace extra_detail { \
template<> \
struct init_guid< T > { \
static guid_initializer< T > const & g; \