update boost

linx64/include/boost/bimap/bimap.hpp

@@ -54,7 +54,7 @@ the next step will be:
 #include <boost/mpl/aux_/na.hpp>
 
 #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION
-    #include <boost/serialization/nvp.hpp>
+    #include <boost/core/serialization.hpp>
 #endif // BOOST_BIMAP_DISABLE_SERIALIZATION
 
 // Boost.Bimap

linx64/include/boost/bimap/container_adaptor/support/iterator_facade_converters.hpp

@@ -28,7 +28,7 @@ namespace support {
 
 /// \brief Converter for Boost.Iterators based iterators.
 /**
-Container adaptor is dessigned to play well with Boost.Iterators. This
+Container adaptor is designed to play well with Boost.Iterators. This
 converter can be used if this library is used to adapt the iterators.
                                                                             **/
 template

linx64/include/boost/bimap/detail/bimap_core.hpp

@@ -47,6 +47,7 @@
 
 #include <boost/bimap/set_of.hpp>
 #include <boost/bimap/unconstrained_set_of.hpp>
+#include <boost/core/allocator_access.hpp>
 
 namespace boost {
 namespace bimaps {
@@ -263,7 +264,7 @@ class bimap_core
 
     // If it is based either on the left or on the right, then only the side
     // indices are needed. But the set type of the relation can be completely
-    // diferent from the one used for the sides in wich case we have to add yet
+    // different from the one used for the sides in which case we have to add yet
     // another index to the core.
 
     // TODO
@@ -306,7 +307,7 @@ class bimap_core
                         relation_set_type_of;
 
     // Logic tags
-    // This is a necesary extra level of indirection to allow unconstrained
+    // This is a necessary extra level of indirection to allow unconstrained
     // sets to be plug in the design. The bimap constructors use this logic
     // tags.
 
@@ -404,8 +405,8 @@ class bimap_core
     <
         relation,
         core_indices,
-        BOOST_DEDUCED_TYPENAME parameters::allocator::
-            BOOST_NESTED_TEMPLATE rebind<relation>::other
+        BOOST_DEDUCED_TYPENAME boost::allocator_rebind<BOOST_DEDUCED_TYPENAME
+            parameters::allocator, relation>::type
 
     > core_type;
 
@@ -445,7 +446,7 @@ class bimap_core
     typedef bimap_core bimap_core_;
 };
 
-// Two auxiliar metafunctions to compute the map view types
+// Two auxiliary metafunctions to compute the map view types
 // The map view type can not be computed inside the bimap core because a 
 // they need the bimap core to be parsed first.
 

linx64/include/boost/bimap/detail/concept_tags.hpp

@@ -34,7 +34,7 @@ metafunctions. For example now is easy to create a is_set_type_of metafunction.
 
 struct set_type_of_tag          {};
 
-/// \brief Tag of {SetType}_of_relation defition classes
+/// \brief Tag of {SetType}_of_relation definition classes
 
 struct set_type_of_relation_tag {};
 
@@ -68,7 +68,7 @@ See also left_based.
 struct left_based : ::boost::bimaps::detail::side_based_tag
 {
     // I run into troubles if I do not define bind for side based tags.
-    // Maybe a more coherent way of binding the relation can be developped.
+    // Maybe a more coherent way of binding the relation can be developed.
     template< class Relation > struct bind_to { typedef void type; };
 
     typedef mpl::bool_<true>  left_mutable_key;
@@ -78,7 +78,7 @@ struct left_based : ::boost::bimaps::detail::side_based_tag
 struct right_based : ::boost::bimaps::detail::side_based_tag
 {
     // I run into troubles if I do not define bind for side based tags.
-    // Maybe a more coherent way of binding the relation can be developped.
+    // Maybe a more coherent way of binding the relation can be developed.
     template< class Relation > struct bind_to { typedef void type; };
 
     typedef mpl::bool_<true>  left_mutable_key;

linx64/include/boost/bimap/detail/manage_additional_parameters.hpp

@@ -83,7 +83,7 @@ struct manage_additional_parameters
     struct case_NNN
     {
         typedef left_based set_type_of_relation;
-        typedef std::allocator<void> allocator;
+        typedef std::allocator<char> allocator;
         typedef ::boost::mpl::na additional_info;
     };
 
@@ -110,7 +110,7 @@ struct manage_additional_parameters
     struct case_SNN
     {
         typedef AP1 set_type_of_relation;
-        typedef std::allocator<void> allocator;
+        typedef std::allocator<char> allocator;
         typedef ::boost::mpl::na additional_info;
     };
 
@@ -137,7 +137,7 @@ struct manage_additional_parameters
     struct case_HNN
     {
         typedef left_based set_type_of_relation;
-        typedef std::allocator<void> allocator;
+        typedef std::allocator<char> allocator;
         typedef BOOST_DEDUCED_TYPENAME AP1::value_type additional_info;
     };
 
@@ -151,7 +151,7 @@ struct manage_additional_parameters
     struct case_SHN
     {
         typedef AP1 set_type_of_relation;
-        typedef std::allocator<void> allocator;
+        typedef std::allocator<char> allocator;
         typedef BOOST_DEDUCED_TYPENAME AP2::value_type additional_info;
     };
 

linx64/include/boost/bimap/detail/map_view_iterator.hpp

@@ -21,7 +21,7 @@
 // Boost
 
 #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION
-  #include <boost/serialization/nvp.hpp>
+  #include <boost/core/serialization.hpp>
 #endif // BOOST_BIMAP_DISABLE_SERIALIZATION
 
 #include <boost/iterator/detail/enable_if.hpp>
@@ -56,7 +56,12 @@ template< class Tag, class BimapCore > struct const_local_map_view_iterator ;
 #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION
 /*===========================================================================*/
 #define BOOST_BIMAP_MAP_VIEW_ITERATOR_SERIALIZATION_SUPPORT                   \
-    BOOST_SERIALIZATION_SPLIT_MEMBER()                                        \
+                                                                              \
+    template< class Archive >                                                 \
+    void serialize(Archive & ar, const unsigned int v)                        \
+    {                                                                         \
+        ::boost::core::split_member( ar, *this, v );                          \
+    }                                                                         \
                                                                               \
     friend class ::boost::serialization::access;                              \
                                                                               \
@@ -123,8 +128,6 @@ struct map_view_iterator :
     map_view_iterator() {}
     map_view_iterator(BOOST_DEDUCED_TYPENAME base_::base_type const& iter)
       : base_(iter) {}
-    map_view_iterator(map_view_iterator const & iter)
-      : base_(iter.base()) {}
 
     BOOST_DEDUCED_TYPENAME base_::reference dereference() const
     {
@@ -135,7 +138,7 @@ struct map_view_iterator :
         );
     }
     private:
-    friend class iterator_core_access;
+    friend class boost::iterators::iterator_core_access;
     BOOST_BIMAP_MAP_VIEW_ITERATOR_SERIALIZATION_SUPPORT
 };
 
@@ -161,8 +164,6 @@ struct const_map_view_iterator :
     const_map_view_iterator(
             BOOST_DEDUCED_TYPENAME base_::base_type const& iter)
       : base_(iter) {}
-    const_map_view_iterator(const_map_view_iterator const & iter)
-      : base_(iter.base()) {}
 	const_map_view_iterator(map_view_iterator<Tag,BimapCore> i)
       : base_(i.base()) {}
 
@@ -171,7 +172,7 @@ struct const_map_view_iterator :
         return ::boost::bimaps::relation::support::pair_by<Tag>(*this->base());
     }
     private:
-    friend class iterator_core_access;
+    friend class boost::iterators::iterator_core_access;
     BOOST_BIMAP_MAP_VIEW_ITERATOR_SERIALIZATION_SUPPORT
 };
 
@@ -200,8 +201,6 @@ struct reverse_map_view_iterator :
     reverse_map_view_iterator(
             BOOST_DEDUCED_TYPENAME base_::base_type const& iter)
       : base_(iter) {}
-    reverse_map_view_iterator(reverse_map_view_iterator const & iter)
-      : base_(iter.base()) {}
 
     BOOST_DEDUCED_TYPENAME base_::reference dereference() const
     {
@@ -212,7 +211,7 @@ struct reverse_map_view_iterator :
         );
     }
     private:
-    friend class iterator_core_access;
+    friend class boost::iterators::iterator_core_access;
     BOOST_BIMAP_MAP_VIEW_ITERATOR_SERIALIZATION_SUPPORT
 };
 
@@ -239,8 +238,6 @@ struct const_reverse_map_view_iterator :
     const_reverse_map_view_iterator(
             BOOST_DEDUCED_TYPENAME base_::base_type const& iter)
       : base_(iter) {}
-    const_reverse_map_view_iterator(const_reverse_map_view_iterator const & iter)
-      : base_(iter.base()) {}
 	const_reverse_map_view_iterator(reverse_map_view_iterator<Tag,BimapCore> i)
       : base_(i.base()) {}
 
@@ -249,7 +246,7 @@ struct const_reverse_map_view_iterator :
         return ::boost::bimaps::relation::support::pair_by<Tag>(*this->base());
     }
     private:
-    friend class iterator_core_access;
+    friend class boost::iterators::iterator_core_access;
     BOOST_BIMAP_MAP_VIEW_ITERATOR_SERIALIZATION_SUPPORT
 };
 
@@ -278,8 +275,6 @@ struct local_map_view_iterator :
     local_map_view_iterator(
             BOOST_DEDUCED_TYPENAME base_::base_type const& iter)
       : base_(iter) {}
-    local_map_view_iterator(local_map_view_iterator const & iter)
-      : base_(iter.base()) {}
 
     BOOST_DEDUCED_TYPENAME base_::reference dereference() const
     {
@@ -290,7 +285,7 @@ struct local_map_view_iterator :
         );
     }
     private:
-    friend class iterator_core_access;
+    friend class boost::iterators::iterator_core_access;
     BOOST_BIMAP_MAP_VIEW_ITERATOR_SERIALIZATION_SUPPORT
 };
 
@@ -316,8 +311,6 @@ struct const_local_map_view_iterator :
     const_local_map_view_iterator(
             BOOST_DEDUCED_TYPENAME base_::base_type const& iter)
       : base_(iter) {}
-    const_local_map_view_iterator(const_local_map_view_iterator const & iter)
-      : base_(iter.base()) {}
 	const_local_map_view_iterator(local_map_view_iterator<Tag,BimapCore> i)
       : base_(i.base()) {}
 
@@ -326,7 +319,7 @@ struct const_local_map_view_iterator :
         return ::boost::bimaps::relation::support::pair_by<Tag>(*this->base());
     }
     private:
-    friend class iterator_core_access;
+    friend class boost::iterators::iterator_core_access;
     BOOST_BIMAP_MAP_VIEW_ITERATOR_SERIALIZATION_SUPPORT
 };
 

linx64/include/boost/bimap/detail/set_view_iterator.hpp

@@ -21,7 +21,7 @@
 // Boost
 
 #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION 
-  #include <boost/serialization/nvp.hpp>
+  #include <boost/core/serialization.hpp>
 #endif // BOOST_BIMAP_DISABLE_SERIALIZATION
 
 #include <boost/iterator/detail/enable_if.hpp>
@@ -84,13 +84,17 @@ struct set_view_iterator : public set_view_iterator_base<CoreIterator>::type
 
     private:
 
-    friend class iterator_core_access;
+    friend class boost::iterators::iterator_core_access;
 
     #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION
 
     // Serialization support
 
-    BOOST_SERIALIZATION_SPLIT_MEMBER()
+    template< class Archive >
+    void serialize(Archive & ar, const unsigned int v)
+    {
+        boost::core::split_member(ar, *this, v);
+    }
 
     friend class ::boost::serialization::access;
 
@@ -160,13 +164,17 @@ struct const_set_view_iterator : public const_set_view_iterator_base<CoreIterato
 
     private:
 
-    friend class iterator_core_access;
+    friend class boost::iterators::iterator_core_access;
 
     #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION
 
     // Serialization support
 
-    BOOST_SERIALIZATION_SPLIT_MEMBER()
+    template< class Archive >
+    void serialize(Archive & ar, const unsigned int v)
+    {
+        boost::core::split_member(ar, *this, v);
+    }
 
     friend class ::boost::serialization::access;
 

linx64/include/boost/bimap/property_map/set_support.hpp

@@ -18,7 +18,6 @@
 
 #include <boost/config.hpp>
 
-#include <boost/property_map/property_map.hpp>
 #include <boost/bimap/set_of.hpp>
 #include <boost/bimap/support/data_type_by.hpp>
 #include <boost/bimap/support/key_type_by.hpp>
@@ -27,6 +26,9 @@
 
 namespace boost {
 
+template <typename PA> struct property_traits;
+struct readable_property_map_tag;
+
 template< class Tag, class Bimap >
 struct property_traits< ::boost::bimaps::views::map_view<Tag,Bimap> >
 {

linx64/include/boost/bimap/property_map/unordered_set_support.hpp

@@ -18,7 +18,6 @@
 
 #include <boost/config.hpp>
 
-#include <boost/property_map/property_map.hpp>
 #include <boost/bimap/unordered_set_of.hpp>
 #include <boost/bimap/support/data_type_by.hpp>
 #include <boost/bimap/support/key_type_by.hpp>
@@ -27,6 +26,9 @@
 
 namespace boost {
 
+template <typename PA> struct property_traits;
+struct readable_property_map_tag;
+
 template< class Tag, class Bimap >
 struct property_traits< ::boost::bimaps::views::unordered_map_view<Tag,Bimap> >
 {

linx64/include/boost/bimap/relation/detail/access_builder.hpp

@@ -24,7 +24,7 @@
 #include <boost/type_traits/is_const.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/not.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 
 
 /******************************************************************************

linx64/include/boost/bimap/relation/detail/metadata_access_builder.hpp

@@ -20,7 +20,7 @@
 
 #include <boost/bimap/relation/support/is_tag_of_member_at.hpp>
 #include <boost/bimap/detail/debug/static_error.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/preprocessor/cat.hpp>
 
 

linx64/include/boost/bimap/relation/detail/mutant.hpp

@@ -25,7 +25,7 @@
 #include <boost/type_traits/is_const.hpp>
 #include <boost/utility/addressof.hpp>
 #include <boost/mpl/not.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 
 namespace boost {
 namespace bimaps {

linx64/include/boost/bimap/relation/detail/static_access_builder.hpp

@@ -21,7 +21,7 @@
 
 #include <boost/bimap/relation/support/is_tag_of_member_at.hpp>
 #include <boost/bimap/detail/debug/static_error.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/preprocessor/cat.hpp>
 
 

linx64/include/boost/bimap/relation/member_at.hpp

@@ -25,7 +25,7 @@ namespace relation {
 /// \brief member_at::side idiom to access relation values and types using metaprogramming. 
 /**
 
-This tags are used to specify which member you want to acces when using a metafunction over
+This tags are used to specify which member you want to access when using a metafunction over
 a symmetrical type. The idea is to be able to write code like:
 
 \code
@@ -44,7 +44,7 @@ namespace member_at {
 
     /// \brief Member at left tag
     /**
-    See also member_at, rigth.
+    See also member_at, right.
                                             **/
 
     struct left  {};

linx64/include/boost/bimap/relation/mutant_relation.hpp

@@ -23,7 +23,7 @@
 #include <boost/call_traits.hpp>
 
 #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION
-  #include <boost/serialization/nvp.hpp>
+  #include <boost/core/serialization.hpp>
 #endif // BOOST_BIMAP_DISABLE_SERIALIZATION
 
 #include <boost/functional/hash/hash.hpp>

linx64/include/boost/bimap/relation/structured_pair.hpp

@@ -26,7 +26,7 @@
 
 #include <boost/call_traits.hpp>
 
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/vector.hpp>
@@ -254,7 +254,7 @@ class mutant_relation;
 /// \brief A std::pair signature compatible class that allows you to control
 ///        the internal structure of the data.
 /**
-This class allows you to specify the order in wich the two data types will be
+This class allows you to specify the order in which the two data types will be
 in the layout of the class.
                                                                                **/
 

linx64/include/boost/bimap/relation/support/get.hpp

@@ -60,13 +60,13 @@ namespace relation {
 namespace support {
 
 // Since it is very error-prone to directly write the hole bunch
-// of relation accesor. They are buil from litle macro blocks that
+// of relation accesor. They are built from little macro blocks that
 // are both more readable, leading to self docummenting code and a
-// lot more easier to understand and mantain.
+// lot more easier to understand and maintain.
 // It is very important to note that the three building blocks have
 // to laid in the same namespace in order to work. There is also
 // important to keep them in order.
-// The forward declaration are not necesary but they help a lot to
+// The forward declaration are not necessary but they help a lot to
 // the reader, as they undercover what is the signature of the
 // result code.
 // In the end, it is not quicker to do it in this way because you

linx64/include/boost/bimap/relation/support/is_tag_of_member_at.hpp

@@ -22,12 +22,12 @@
 #include <boost/type_traits/is_same.hpp>
 
 #include <boost/mpl/bool.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/bimap/relation/support/member_with_tag.hpp>
 
 /** \struct boost::bimaps::relation::support::is_tag_of_member_at_left
 
-\brief Metafunction to test if a user tag is refering to the left member.
+\brief Metafunction to test if a user tag is referring to the left member.
 
 \code
 
@@ -53,7 +53,7 @@ See also member_with_tag, member_at, is_tag_of_member_at_right.
 
 /** \struct boost::bimaps::relation::support::is_tag_of_member_at_right
 
-\brief Metafunction to test if a user tag is refering to the left member.
+\brief Metafunction to test if a user tag is referring to the left member.
 
 \code
 

linx64/include/boost/bimap/relation/support/member_with_tag.hpp

@@ -20,7 +20,7 @@
 
 #include <boost/bimap/relation/member_at.hpp>
 #include <boost/bimap/detail/debug/static_error.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/not.hpp>

linx64/include/boost/bimap/relation/support/pair_by.hpp

@@ -54,13 +54,13 @@ namespace support {
 
 
 // Since it is very error-prone to directly write the hole bunch
-// of relation accesor. They are buil from litle macro blocks that
+// of relation accesor. They are built from little macro blocks that
 // are both more readable, leading to self docummenting code and a
-// lot more easier to understand and mantain.
+// lot more easier to understand and maintain.
 // It is very important to note that the three building blocks have
 // to laid in the same namespace in order to work. There is also
 // important to keep them in order.
-// The forward declaration are not necesary but they help a lot to
+// The forward declaration are not necessary but they help a lot to
 // the reader, as they undercover what is the signature of the
 // result code.
 // In the end, it is not quicker to do it in this way because you

linx64/include/boost/bimap/relation/symmetrical_base.hpp

@@ -32,7 +32,7 @@ namespace boost {
 namespace bimaps {
 namespace relation {
 
-/// \brief Base of symetrical tagged types.
+/// \brief Base of symmetrical tagged types.
 /**
 
                                                            **/

linx64/include/boost/bimap/support/map_by.hpp

@@ -68,13 +68,13 @@ namespace bimaps {
 namespace support {
 
 // Since it is very error-prone to directly write the hole bunch
-// of relation accesor. They are buil from litle macro blocks that
+// of relation accesor. They are built from little macro blocks that
 // are both more readable, leading to self docummenting code and a
-// lot more easier to understand and mantain.
+// lot more easier to understand and maintain.
 // It is very important to note that the three building blocks have
 // to laid in the same namespace in order to work. There is also
 // important to keep them in order.
-// The forward declaration are not necesary but they help a lot to
+// The forward declaration are not necessary but they help a lot to
 // the reader, as they undercover what is the signature of the
 // result code.
 // In the end, it is not quicker to do it in this way because you

linx64/include/boost/bimap/tags/support/apply_to_value_type.hpp

@@ -38,7 +38,7 @@ struct apply_to_value_type
 \endcode
 
 This higher order metafunctions is very useful, and it can be used with lambda
-expresions.
+expressions.
 
 See also tagged.
                                                                                 **/

linx64/include/boost/bimap/tags/support/tag_of.hpp

@@ -7,7 +7,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 /// \file tags/support/tag_of.hpp
-/// \brief Safe way to acces the tag of a type
+/// \brief Safe way to access the tag of a type
 
 #ifndef BOOST_BIMAP_TAGS_SUPPORT_TAG_OF_HPP
 #define BOOST_BIMAP_TAGS_SUPPORT_TAG_OF_HPP

linx64/include/boost/bimap/tags/support/value_type_of.hpp

@@ -32,7 +32,7 @@ struct value_type_of
 \endcode
 
 If the type is tagged this metafunction returns Type::value_type, and if it is not
-tagged it return the same type. This allows to work consistenly with tagged and
+tagged it return the same type. This allows to work consistently with tagged and
 untagged types.
 
 See also tagged, tag_of.

linx64/include/boost/bimap/tags/tagged.hpp

@@ -92,7 +92,7 @@ struct tagged
 \brief Metafunctions to work with tagged types.
 
 This metafunctions aims to make easier the manage of tagged types. They are all mpl
-compatible metafunctions and can be used with lambda expresions.
+compatible metafunctions and can be used with lambda expressions.
 The metafunction value_type_of and tag_of get the data in a tagged type in a secure
 and consistent way.
 default_tagged and overwrite_tagged allows to work with the tag of a tagged type,