update boost on linux

linx64/include/boost/bimap/container_adaptor/detail/comparison_adaptor.hpp

@@ -19,7 +19,6 @@
 #include <boost/config.hpp>
 
 #include <boost/call_traits.hpp>
-#include <functional>
 
 namespace boost {
 namespace bimaps {
@@ -33,8 +32,12 @@ A simple comparison adaptor.
                                                                                     **/
 
 template < class Compare, class NewType, class Converter >
-struct comparison_adaptor : std::binary_function<NewType,NewType,bool>
+struct comparison_adaptor
 {
+    typedef NewType first_argument_type;
+    typedef NewType second_argument_type;
+    typedef bool result_type;
+
     comparison_adaptor( const Compare & comp, const Converter & conv)
         : compare(comp), converter(conv) {}
 
@@ -50,8 +53,12 @@ struct comparison_adaptor : std::binary_function<NewType,NewType,bool>
 };
 
 template < class Compare, class NewType, class Converter >
-struct compatible_comparison_adaptor : std::binary_function<NewType,NewType,bool>
+struct compatible_comparison_adaptor
 {
+    typedef NewType first_argument_type;
+    typedef NewType second_argument_type;
+    typedef bool result_type;
+
     compatible_comparison_adaptor( const Compare & comp, const Converter & conv)
         : compare(comp), converter(conv) {}
 
@@ -75,8 +82,11 @@ A simple unary check adaptor.
                                                                                     **/
 
 template < class Compare, class NewType, class Converter >
-struct unary_check_adaptor : std::unary_function<NewType,bool>
+struct unary_check_adaptor
 {
+    typedef BOOST_DEDUCED_TYPENAME call_traits<NewType>::param_type argument_type;
+    typedef bool result_type;
+
     unary_check_adaptor( const Compare & comp, const Converter & conv ) :
         compare(comp), converter(conv) {}
 

linx64/include/boost/bimap/container_adaptor/detail/key_extractor.hpp

@@ -18,8 +18,6 @@
 
 #include <boost/config.hpp>
 
-#include <functional>
-
 namespace boost {
 namespace bimaps {
 namespace container_adaptor {
@@ -29,9 +27,11 @@ namespace detail {
 
 template < class T >
 struct key_from_pair_extractor 
-    : std::unary_function< T, BOOST_DEDUCED_TYPENAME T::first_type >
 {
-    bool operator()( const T & p ) { return p.first; }
+    typedef T argument_type;
+    typedef BOOST_DEDUCED_TYPENAME T::first_type result_type;
+
+    result_type operator()( const T & p ) { return p.first; }
 };
 
 } // namespace detail

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

@@ -18,8 +18,6 @@
 
 #include <boost/config.hpp>
 
-#include <functional>
-
 namespace boost {
 namespace bimaps {
 namespace detail {
@@ -34,11 +32,13 @@ template
     class SecondExtractor 
 >
 struct relation_modifier_adaptor :
-    public std::unary_function<NewArgument,bool>,
     Modifier,
     FirstExtractor,
     SecondExtractor
 {
+    typedef NewArgument argument_type;
+    typedef void result_type;
+
     relation_modifier_adaptor( const Modifier & m ) : Modifier(m) {}
     relation_modifier_adaptor( const Modifier & m,
                                const FirstExtractor & fe,
@@ -65,10 +65,12 @@ template
     class Extractor
 >
 struct unary_modifier_adaptor :
-    public std::unary_function<NewArgument,bool>,
     Modifier,
     Extractor
 {
+    typedef NewArgument argument_type;
+    typedef void result_type;
+
     unary_modifier_adaptor( const Modifier & m ) : Modifier(m) {}
     unary_modifier_adaptor( const Modifier & m,
                             const Extractor & fe) :

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

@@ -19,7 +19,6 @@
 #include <boost/config.hpp>
 
 #include <boost/bimap/relation/detail/metadata_access_builder.hpp>
-#include <functional>
 
 /** \struct boost::bimaps::relation::support::data_extractor
 
@@ -39,9 +38,11 @@ template< class Tag, class Relation >
 struct data_extractor_implementation;
 
 template< class Relation >
-struct data_extractor_implementation< member_at::left, Relation > :
-    public std::unary_function<Relation,BOOST_DEDUCED_TYPENAME Relation::left_value_type>
+struct data_extractor_implementation< member_at::left, Relation >
 {
+    typedef Relation argument_type;
+    typedef BOOST_DEDUCED_TYPENAME Relation::left_value_type result_type;
+
     BOOST_DEDUCED_TYPENAME Relation::left_value_type const &
         operator()(Relation const & rel) const
     {
@@ -56,9 +57,11 @@ struct data_extractor_implementation< member_at::left, Relation > :
 };
 
 template< class Relation >
-struct data_extractor_implementation< member_at::right, Relation > :
-    public std::unary_function<Relation,BOOST_DEDUCED_TYPENAME Relation::right_value_type>
+struct data_extractor_implementation< member_at::right, Relation >
 {
+    typedef Relation argument_type;
+    typedef BOOST_DEDUCED_TYPENAME Relation::right_value_type result_type;
+
     BOOST_DEDUCED_TYPENAME Relation::right_value_type const & 
         operator()(Relation const & rel) const
     {