[Boost-commit] svn:boost r46220 - in trunk/boost/archive: array detail impl

From: ramey_at_[hidden]
Date: 2008-06-07 19:40:06

Author: ramey
Date: 2008-06-07 19:40:05 EDT (Sat, 07 Jun 2008)
New Revision: 46220
URL: http://svn.boost.org/trac/boost/changeset/46220

Log:
miscellaneous adjustments in to address trunk test failures
Text files modified: 
   trunk/boost/archive/array/iarchive.hpp          |     4 ++--                                    
   trunk/boost/archive/array/oarchive.hpp          |     4 ++--                                    
   trunk/boost/archive/detail/iserializer.hpp      |     4 ++--                                    
   trunk/boost/archive/detail/oserializer.hpp      |     4 ++--                                    
   trunk/boost/archive/detail/register_archive.hpp |     2 +-                                      
   trunk/boost/archive/impl/basic_xml_oarchive.ipp |     2 +-                                      
   trunk/boost/archive/impl/xml_iarchive_impl.ipp  |     4 +++-                                    
   trunk/boost/archive/impl/xml_wiarchive_impl.ipp |     4 +++-                                    
   8 files changed, 16 insertions(+), 12 deletions(-)

Modified: trunk/boost/archive/array/iarchive.hpp
==============================================================================
--- trunk/boost/archive/array/iarchive.hpp	(original)
+++ trunk/boost/archive/array/iarchive.hpp	2008-06-07 19:40:05 EDT (Sat, 07 Jun 2008)
@@ -92,7 +92,7 @@
   template<class ValueType, class Allocator>
   void load_override(std::vector<ValueType,Allocator> &x, unsigned int version)
   {
-    typedef typename mpl::and_<
+    typedef BOOST_DEDUCED_TYPENAME mpl::and_<
       mpl::not_<is_same<ValueType,bool> >,
       mpl::apply1<
         BOOST_DEDUCED_TYPENAME Archive::use_array_optimization
@@ -105,7 +105,7 @@
   template<class ValueType>
   void load_override(serialization::array<ValueType> const& x, unsigned int version)
   {
-    typedef typename mpl::apply1<
+    typedef BOOST_DEDUCED_TYPENAME mpl::apply1<
         BOOST_DEDUCED_TYPENAME Archive::use_array_optimization
       , ValueType
     >::type use_optimized;

Modified: trunk/boost/archive/array/oarchive.hpp
==============================================================================
--- trunk/boost/archive/array/oarchive.hpp	(original)
+++ trunk/boost/archive/array/oarchive.hpp	2008-06-07 19:40:05 EDT (Sat, 07 Jun 2008)
@@ -90,7 +90,7 @@
   void save_override(std::vector<ValueType,Allocator> const &x, unsigned int version)
   {
     typedef BOOST_DEDUCED_TYPENAME remove_const<ValueType>::type value_type;
-    typedef typename mpl::and_<
+    typedef BOOST_DEDUCED_TYPENAME mpl::and_<
       mpl::not_<is_same<value_type,bool> >,
       mpl::apply1<
         BOOST_DEDUCED_TYPENAME Archive::use_array_optimization
@@ -103,7 +103,7 @@
   template<class ValueType>
   void save_override(serialization::array<ValueType> const& x, unsigned int version)
   {
-    typedef typename mpl::apply1<
+    typedef BOOST_DEDUCED_TYPENAME mpl::apply1<
         BOOST_DEDUCED_TYPENAME Archive::use_array_optimization
       , BOOST_DEDUCED_TYPENAME remove_const<ValueType>::type
     >::type use_optimized;

Modified: trunk/boost/archive/detail/iserializer.hpp
==============================================================================
--- trunk/boost/archive/detail/iserializer.hpp	(original)
+++ trunk/boost/archive/detail/iserializer.hpp	2008-06-07 19:40:05 EDT (Sat, 07 Jun 2008)
@@ -44,7 +44,7 @@
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/remove_const.hpp>
 #include <boost/type_traits/remove_all_extents.hpp>
-#include <boost/serialization/is_abstract.hpp>
+#include <boost/serialization/assume_abstract.hpp>
 #include <boost/type_traits/is_polymorphic.hpp>
 
 #include <boost/mpl/eval_if.hpp>
@@ -469,7 +469,7 @@
 template<class Archive, class T>
 struct load_array_type {
     static void invoke(Archive &ar, T &t){
-        typedef typename remove_all_extents<T>::type value_type;
+        typedef BOOST_DEDUCED_TYPENAME remove_all_extents<T>::type value_type;
         
         // convert integers to correct enum to load
         int current_count = sizeof(t) / (

Modified: trunk/boost/archive/detail/oserializer.hpp
==============================================================================
--- trunk/boost/archive/detail/oserializer.hpp	(original)
+++ trunk/boost/archive/detail/oserializer.hpp	2008-06-07 19:40:05 EDT (Sat, 07 Jun 2008)
@@ -38,7 +38,7 @@
 //#include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_polymorphic.hpp>
 #include <boost/type_traits/remove_all_extents.hpp>
-#include <boost/serialization/is_abstract.hpp>
+#include <boost/serialization/assume_abstract.hpp>
 
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/and.hpp>
@@ -464,7 +464,7 @@
 struct save_array_type
 {
     static void invoke(Archive &ar, const T &t){
-        typedef typename remove_all_extents<T>::type value_type;
+        typedef BOOST_DEDUCED_TYPENAME remove_all_extents<T>::type value_type;
         
         save_access::end_preamble(ar);
         // consider alignment

Modified: trunk/boost/archive/detail/register_archive.hpp
==============================================================================
--- trunk/boost/archive/detail/register_archive.hpp	(original)
+++ trunk/boost/archive/detail/register_archive.hpp	2008-06-07 19:40:05 EDT (Sat, 07 Jun 2008)
@@ -43,7 +43,7 @@
 namespace boost { namespace archive { namespace detail {                \
                                                                         \
 template <class Serializable>                                           \
-typename _ptr_serialization_support<Archive, Serializable>::type        \
+BOOST_DEDUCED_TYPENAME _ptr_serialization_support<Archive, Serializable>::type  \
 instantiate_ptr_serialization( Serializable*, Archive*, adl_tag );              \
                                                                         \
 }}}

Modified: trunk/boost/archive/impl/basic_xml_oarchive.ipp
==============================================================================
--- trunk/boost/archive/impl/basic_xml_oarchive.ipp	(original)
+++ trunk/boost/archive/impl/basic_xml_oarchive.ipp	2008-06-07 19:40:05 EDT (Sat, 07 Jun 2008)
@@ -263,7 +263,7 @@
 basic_xml_oarchive<Archive>::~basic_xml_oarchive(){
     if(0 == (this->get_flags() & no_header)){
         BOOST_TRY{
-                this->This()->put("</boost_serialization>");
+                this->This()->put("</boost_serialization>\n");
         }
         BOOST_CATCH(...){}
         BOOST_CATCH_END

Modified: trunk/boost/archive/impl/xml_iarchive_impl.ipp
==============================================================================
--- trunk/boost/archive/impl/xml_iarchive_impl.ipp	(original)
+++ trunk/boost/archive/impl/xml_iarchive_impl.ipp	2008-06-07 19:40:05 EDT (Sat, 07 Jun 2008)
@@ -143,7 +143,9 @@
 xml_iarchive_impl<Archive>::load_override(class_name_type & t, int){
     const std::string & s = gimpl->rv.class_name;
     if(s.size() > BOOST_SERIALIZATION_MAX_KEY_SIZE - 1)
-        boost::throw_exception( archive_exception( archive_exception::invalid_class_name ) );
+        boost::throw_exception(
+            archive_exception(archive_exception::invalid_class_name)
+       );
     char * tptr = t;
     std::memcpy(tptr, s.data(), s.size());
     tptr[s.size()] = '\0';

Modified: trunk/boost/archive/impl/xml_wiarchive_impl.ipp
==============================================================================
--- trunk/boost/archive/impl/xml_wiarchive_impl.ipp	(original)
+++ trunk/boost/archive/impl/xml_wiarchive_impl.ipp	2008-06-07 19:40:05 EDT (Sat, 07 Jun 2008)
@@ -136,7 +136,9 @@
 xml_wiarchive_impl<Archive>::load_override(class_name_type & t, int){
     const std::wstring & ws = gimpl->rv.class_name;
     if(ws.size() > BOOST_SERIALIZATION_MAX_KEY_SIZE - 1)
-        boost::throw_exception( archive_exception( archive_exception::invalid_class_name ) );
+        boost::throw_exception(
+            archive_exception(archive_exception::invalid_class_name)
+        );
     copy_to_ptr(t, ws);
 }