[Boost-commit] svn:boost r60265 - branches/release/boost/archive/detail

Subject: [Boost-commit] svn:boost r60265 - branches/release/boost/archive/detail
From: ramey_at_[hidden]
Date: 2010-03-06 21:35:30

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

Log:
Suppress multiple definition trap
Text files modified: 
   branches/release/boost/archive/detail/archive_serializer_map.hpp |     4 ++--                                    
   branches/release/boost/archive/detail/basic_serializer_map.hpp   |     8 ++++++--                                
   2 files changed, 8 insertions(+), 4 deletions(-)

Modified: branches/release/boost/archive/detail/archive_serializer_map.hpp
==============================================================================
--- branches/release/boost/archive/detail/archive_serializer_map.hpp	(original)
+++ branches/release/boost/archive/detail/archive_serializer_map.hpp	2010-03-06 21:35:30 EST (Sat, 06 Mar 2010)
@@ -36,8 +36,8 @@
 class basic_serializer;
 
 template<class Archive>
-class BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) archive_serializer_map 
-{
+class BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) 
+archive_serializer_map {
 public:
     static bool insert(const basic_serializer * bs);
     static void erase(const basic_serializer * bs);

Modified: branches/release/boost/archive/detail/basic_serializer_map.hpp
==============================================================================
--- branches/release/boost/archive/detail/basic_serializer_map.hpp	(original)
+++ branches/release/boost/archive/detail/basic_serializer_map.hpp	2010-03-06 21:35:30 EST (Sat, 06 Mar 2010)
@@ -34,7 +34,8 @@
 
 class basic_serializer;
 
-class BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) basic_serializer_map : public
+class BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY())
+basic_serializer_map : public
     boost::noncopyable
 {
     struct type_info_pointer_compare
@@ -43,7 +44,10 @@
             const basic_serializer * lhs, const basic_serializer * rhs
         ) const ;
     };
-    typedef std::set<const basic_serializer *, type_info_pointer_compare> map_type;
+    typedef std::set<
+        const basic_serializer *, 
+        type_info_pointer_compare
+    > map_type;
     map_type m_map;
 public:
     bool insert(const basic_serializer * bs);