[Boost-commit] svn:boost r47117 - in trunk/boost/archive: . detail impl

From: ramey_at_[hidden]
Date: 2008-07-05 15:18:24

Author: ramey
Date: 2008-07-05 15:18:23 EDT (Sat, 05 Jul 2008)
New Revision: 47117
URL: http://svn.boost.org/trac/boost/changeset/47117

Log:
Adjustments to address failures in VACPP and borland compilations
Text files modified: 
   trunk/boost/archive/basic_binary_iprimitive.hpp |     8 ++++----                                
   trunk/boost/archive/basic_binary_oprimitive.hpp |     4 ++--                                    
   trunk/boost/archive/detail/oserializer.hpp      |    12 +++++-------                            
   trunk/boost/archive/impl/xml_wiarchive_impl.ipp |     2 +-                                      
   trunk/boost/archive/impl/xml_woarchive_impl.ipp |     7 ++++---                                 
   trunk/boost/archive/shared_ptr_helper.hpp       |     6 +++++-                                  
   6 files changed, 21 insertions(+), 18 deletions(-)

Modified: trunk/boost/archive/basic_binary_iprimitive.hpp
==============================================================================
--- trunk/boost/archive/basic_binary_iprimitive.hpp	(original)
+++ trunk/boost/archive/basic_binary_iprimitive.hpp	2008-07-05 15:18:23 EDT (Sat, 05 Jul 2008)
@@ -120,11 +120,11 @@
     ~basic_binary_iprimitive();
 public:
     // we provide an optimized load for all fundamental types
-    //typedef serialization::is_bitwise_serializable<mpl::_1> 
-    //  use_array_optimization;
+    // typedef serialization::is_bitwise_serializable<mpl::_1> 
+    // use_array_optimization;
     struct use_array_optimization {
-      template <class T>
-      struct apply : public serialization::is_bitwise_serializable<T> {};
+        template <class T>
+        struct apply : public serialization::is_bitwise_serializable<T> {};
     };
 
     // the optimized load_array dispatches to load_binary 

Modified: trunk/boost/archive/basic_binary_oprimitive.hpp
==============================================================================
--- trunk/boost/archive/basic_binary_oprimitive.hpp	(original)
+++ trunk/boost/archive/basic_binary_oprimitive.hpp	2008-07-05 15:18:23 EDT (Sat, 05 Jul 2008)
@@ -120,13 +120,13 @@
     // workaround without using mpl lambdas
     struct use_array_optimization {
       template <class T>
-      struct apply : public serialization::is_bitwise_serializable<T> {};
+      struct apply : public boost::serialization::is_bitwise_serializable<T> {};
     };
     
 
     // the optimized save_array dispatches to save_binary 
     template <class ValueType>
-    void save_array(serialization::array<ValueType> const& a, unsigned int)
+    void save_array(boost::serialization::array<ValueType> const& a, unsigned int)
     {
       save_binary(a.address(),a.count()*sizeof(ValueType));
     }

Modified: trunk/boost/archive/detail/oserializer.hpp
==============================================================================
--- trunk/boost/archive/detail/oserializer.hpp	(original)
+++ trunk/boost/archive/detail/oserializer.hpp	2008-07-05 15:18:23 EDT (Sat, 05 Jul 2008)
@@ -353,13 +353,7 @@
             T & t
         ){
             BOOST_DEDUCED_TYPENAME 
-            // Borland complains if "const" is applied to something that
-            // is already "const"
-            #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x560))
-            const boost::serialization::type_info_implementation<T>::type 
-            #else
             boost::serialization::type_info_implementation<T>::type const
-            #endif
             & i = boost::serialization::type_info_implementation<T>::type
                     ::get_const_instance();
 
@@ -389,7 +383,11 @@
             }
             // convert pointer to more derived type. if this is thrown
             // it means that the base/derived relationship hasn't be registered
-            vp = serialization::void_downcast(*true_type, *this_type, &t);
+            vp = serialization::void_downcast(
+                *true_type, 
+                *this_type, 
+                static_cast<const void *>(&t)
+            );
             if(NULL == vp){
                 boost::throw_exception(
                     archive_exception(archive_exception::unregistered_cast)

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-07-05 15:18:23 EDT (Sat, 05 Jul 2008)
@@ -166,7 +166,7 @@
         archive_locale.reset(
             add_facet(
                 std::locale::classic(),
-                new detail::utf8_codecvt_facet
+                new boost::archive::detail::utf8_codecvt_facet
             )
         );
         is.imbue(* archive_locale);

Modified: trunk/boost/archive/impl/xml_woarchive_impl.ipp
==============================================================================
--- trunk/boost/archive/impl/xml_woarchive_impl.ipp	(original)
+++ trunk/boost/archive/impl/xml_woarchive_impl.ipp	2008-07-05 15:18:23 EDT (Sat, 05 Jul 2008)
@@ -139,12 +139,13 @@
     // we can hack around this by using a static codecvt that never
     // gets destroyed.
     if(0 == (flags & no_codecvt)){
-        detail::utf8_codecvt_facet *pfacet;
+        boost::archive::detail::utf8_codecvt_facet *pfacet;
         #if defined(__SGI_STL_PORT)
-            static detail::utf8_codecvt_facet facet(static_cast<size_t>(1));
+            static boost::archive::detail::utf8_codecvt_facet 
+                facet(static_cast<size_t>(1));
             pfacet = & facet;
         #else
-            pfacet = new detail::utf8_codecvt_facet;
+            pfacet = new boost::archive::detail::utf8_codecvt_facet;
         #endif
         archive_locale.reset(add_facet(std::locale::classic(), pfacet));
         os.imbue(* archive_locale);

Modified: trunk/boost/archive/shared_ptr_helper.hpp
==============================================================================
--- trunk/boost/archive/shared_ptr_helper.hpp	(original)
+++ trunk/boost/archive/shared_ptr_helper.hpp	2008-07-05 15:18:23 EDT (Sat, 05 Jul 2008)
@@ -101,7 +101,11 @@
         const boost::serialization::extended_type_info * this_type
             = & boost::serialization::type_info_implementation<T>::type
                     ::get_const_instance();
-        void * vp = void_downcast(*true_type, *this_type, t);
+        void * vp = void_downcast(
+            *true_type, 
+            *this_type, 
+            static_cast<const void *>(t)
+        );
         return vp;
     }
 public: