update boost

linx64/include/boost/ptr_container/detail/reversible_ptr_container.hpp

@@ -410,7 +410,7 @@ namespace ptr_container_detail
           : c_( a )
         { 
             constructor_impl( first, last, 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 #else
                               BOOST_DEDUCED_TYPENAME
 #endif                              
@@ -440,7 +440,7 @@ namespace ptr_container_detail
           : c_( n )
         {
             constructor_impl( first, last, 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 #else
                               BOOST_DEDUCED_TYPENAME
 #endif                              
@@ -730,7 +730,7 @@ namespace ptr_container_detail
     }; // 'reversible_ptr_container'
 
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))    
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))    
 #define BOOST_PTR_CONTAINER_DEFINE_RELEASE( base_type ) \
     typename base_type::auto_type                   \
     release( typename base_type::iterator i )       \

linx64/include/boost/ptr_container/detail/serialize_ptr_map_adapter.hpp

@@ -8,8 +8,7 @@
 
 #include <boost/ptr_container/ptr_map_adapter.hpp>
 #include <boost/ptr_container/detail/serialize_xml_names.hpp>
-#include <boost/serialization/split_free.hpp>
-#include <boost/serialization/nvp.hpp>
+#include <boost/core/serialization.hpp>
 
 namespace boost 
 {

linx64/include/boost/ptr_container/detail/serialize_reversible_cont.hpp

@@ -8,8 +8,7 @@
 
 #include <boost/ptr_container/detail/reversible_ptr_container.hpp>
 #include <boost/ptr_container/detail/serialize_xml_names.hpp>
-#include <boost/serialization/split_free.hpp>
-#include <boost/serialization/nvp.hpp>
+#include <boost/core/serialization.hpp>
 
 namespace boost 
 {

linx64/include/boost/ptr_container/detail/static_move_ptr.hpp

@@ -65,7 +65,7 @@ public:
             const_cast<static_move_ptr&>(p).release();
         }
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))    
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))    
     static_move_ptr( const move_ptrs::move_source<static_move_ptr<T,Deleter> >& src )
 #else
     static_move_ptr( const move_ptrs::move_source<static_move_ptr>& src )

linx64/include/boost/ptr_container/ptr_sequence_adapter.hpp

@@ -91,25 +91,18 @@ namespace ptr_container_detail
         
 #else // BOOST_NO_SFINAE
 
-#if BOOST_WORKAROUND(__MWERKS__, <= 0x3003)
         template< class Iter >
         static const U* get_const_pointer( void_ptr_iterator<Iter,U> i )
         {
             return static_cast<const U*>( *i.base() );
         }
-#else // BOOST_WORKAROUND
-        template< class Iter >
-        static const U* get_const_pointer( void_ptr_iterator<Iter,const U> i )
-        {
-            return static_cast<const U*>( *i.base() );
-        }
-#endif // BOOST_WORKAROUND
 
         template< class Iter >
         static const U* get_const_pointer( Iter i )
         {
             return &*i;
         }
+
 #endif // BOOST_NO_SFINAE
 
         BOOST_STATIC_CONSTANT(bool, allow_null = boost::is_nullable<T>::value );

linx64/include/boost/ptr_container/ptr_vector.hpp

@@ -19,6 +19,8 @@
 #include <vector>
 #include <boost/ptr_container/ptr_sequence_adapter.hpp>
 #include <boost/ptr_container/detail/ptr_container_disable_deprecated.hpp>
+#include <boost/type_traits/is_same.hpp>
+#include <boost/mpl/if.hpp>
 
 #if defined(BOOST_PTR_CONTAINER_DISABLE_DEPRECATED)
 #pragma GCC diagnostic push
@@ -32,16 +34,27 @@ namespace boost
     < 
         class T, 
         class CloneAllocator = heap_clone_allocator,
-        class Allocator      = std::allocator<typename ptr_container_detail::void_ptr<T>::type>
+        class Allocator      = void
     >
     class ptr_vector : public 
-        ptr_sequence_adapter< T, std::vector<
-            typename ptr_container_detail::void_ptr<T>::type,Allocator>, 
-                              CloneAllocator >
+        ptr_sequence_adapter< T,
+            std::vector<
+                typename ptr_container_detail::void_ptr<T>::type,
+                typename boost::mpl::if_<boost::is_same<Allocator, void>,
+                    std::allocator<typename ptr_container_detail::void_ptr<T>::type>, Allocator>::type
+            >,
+            CloneAllocator >
     {  
-        typedef ptr_sequence_adapter< T, std::vector<
-            typename ptr_container_detail::void_ptr<T>::type,Allocator>, 
-                                      CloneAllocator > 
+        typedef
+
+            ptr_sequence_adapter< T,
+                std::vector<
+                    typename ptr_container_detail::void_ptr<T>::type,
+                    typename boost::mpl::if_<boost::is_same<Allocator, void>,
+                        std::allocator<typename ptr_container_detail::void_ptr<T>::type>, Allocator>::type
+                >,
+                CloneAllocator >
+
             base_class;
 
         typedef ptr_vector<T,CloneAllocator,Allocator> this_type;

linx64/include/boost/ptr_container/serialize_ptr_array.hpp

@@ -38,7 +38,7 @@ void load(Archive& ar, ptr_array<T, N, CloneAllocator>& c, unsigned int /*versio
 template<class Archive, class T, std::size_t N, class CloneAllocator>
 void serialize(Archive& ar, ptr_array<T, N, CloneAllocator>& c, const unsigned int version)
 {
-   split_free(ar, c, version);
+    core::split_free(ar, c, version);
 }
 
 } // namespace serialization

linx64/include/boost/ptr_container/serialize_ptr_circular_buffer.hpp

@@ -37,7 +37,7 @@ void load(Archive& ar, ptr_circular_buffer<T, CloneAllocator, Allocator>& c, uns
 template<class Archive, class T, class CloneAllocator, class Allocator>
 void serialize(Archive& ar, ptr_circular_buffer<T, CloneAllocator, Allocator>& c, const unsigned int version)
 {
-   split_free(ar, c, version);
+   core::split_free(ar, c, version);
 }
 
 } // namespace serialization

linx64/include/boost/ptr_container/serialize_ptr_deque.hpp

@@ -18,7 +18,7 @@ namespace serialization
 template<class Archive, class T, class CloneAllocator, class Allocator>
 void serialize(Archive& ar, ptr_deque<T, CloneAllocator, Allocator>& c, const unsigned int version)
 {
-   split_free(ar, c, version);
+   core::split_free(ar, c, version);
 }
 
 } // namespace serialization

linx64/include/boost/ptr_container/serialize_ptr_list.hpp

@@ -18,7 +18,7 @@ namespace serialization
 template<class Archive, class T, class CloneAllocator, class Allocator>
 void serialize(Archive& ar, ptr_list<T, CloneAllocator, Allocator>& c, const unsigned int version)
 {
-   split_free(ar, c, version);
+   core::split_free(ar, c, version);
 }
 
 } // namespace serialization

linx64/include/boost/ptr_container/serialize_ptr_map.hpp

@@ -18,13 +18,13 @@ namespace serialization
 template<class Archive, class Key, class T, class Compare, class CloneAllocator, class Allocator>
 void serialize(Archive& ar, ptr_map<Key, T, Compare, CloneAllocator, Allocator>& c, const unsigned int version)
 {
-   split_free(ar, c, version);
+   core::split_free(ar, c, version);
 }
 
 template<class Archive, class Key, class T, class Compare, class CloneAllocator, class Allocator>
 void serialize(Archive& ar, ptr_multimap<Key, T, Compare, CloneAllocator, Allocator>& c, const unsigned int version)
 {
-   split_free(ar, c, version);
+   core::split_free(ar, c, version);
 }
 
 } // namespace serialization

linx64/include/boost/ptr_container/serialize_ptr_set.hpp

@@ -18,13 +18,13 @@ namespace serialization
 template<class Archive, class T, class CloneAllocator, class Allocator>
 void serialize(Archive& ar, ptr_set<T, CloneAllocator, Allocator>& c, const unsigned int version)
 {
-   split_free(ar, c, version);
+   core::split_free(ar, c, version);
 }
 
 template<class Archive, class T, class CloneAllocator, class Allocator>
 void serialize(Archive& ar, ptr_multiset<T, CloneAllocator, Allocator>& c, const unsigned int version)
 {
-   split_free(ar, c, version);
+   core::split_free(ar, c, version);
 }
 
 } // namespace serialization

linx64/include/boost/ptr_container/serialize_ptr_unordered_map.hpp

@@ -24,13 +24,13 @@ namespace serialization
 template<class Archive, class Key, class T, class Hash, class Pred, class CloneAllocator, class Allocator>
 void serialize(Archive& ar, ptr_unordered_map<Key, T, Hash, Pred, CloneAllocator, Allocator>& c, const unsigned int version)
 {
-   split_free(ar, c, version);
+   core::split_free(ar, c, version);
 }
 
 template<class Archive, class Key, class T, class Hash, class Pred, class CloneAllocator, class Allocator>
 void serialize(Archive& ar, ptr_unordered_multimap<Key, T, Hash, Pred, CloneAllocator, Allocator>& c, const unsigned int version)
 {
-   split_free(ar, c, version);
+   core::split_free(ar, c, version);
 }
 
 } // namespace serialization

linx64/include/boost/ptr_container/serialize_ptr_unordered_set.hpp

@@ -24,13 +24,13 @@ namespace serialization
 template<class Archive, class T, class Hash, class Pred, class CloneAllocator, class Allocator>
 void serialize(Archive& ar, ptr_unordered_set<T, Hash, Pred, CloneAllocator, Allocator>& c, const unsigned int version)
 {
-   split_free(ar, c, version);
+   core::split_free(ar, c, version);
 }
 
 template<class Archive, class T, class Hash, class Pred, class CloneAllocator, class Allocator>
 void serialize(Archive& ar, ptr_unordered_multiset<T, Hash, Pred, CloneAllocator, Allocator>& c, const unsigned int version)
 {
-   split_free(ar, c, version);
+   core::split_free(ar, c, version);
 }
 
 } // namespace serialization

linx64/include/boost/ptr_container/serialize_ptr_vector.hpp

@@ -31,7 +31,7 @@ void load(Archive& ar, ptr_vector<T, CloneAllocator, Allocator>& c, unsigned int
 template<class Archive, class T, class CloneAllocator, class Allocator>
 void serialize(Archive& ar, ptr_vector<T, CloneAllocator, Allocator>& c, const unsigned int version)
 {
-   split_free(ar, c, version);
+   core::split_free(ar, c, version);
 }
 
 } // namespace serialization