update boost

linx64/include/boost/assign/assignment_exception.hpp

@@ -30,7 +30,7 @@ namespace boost
             : what_( _what )
             { }
 
-            virtual const char* what() const BOOST_NOEXCEPT_OR_NOTHROW
+            virtual const char* what() const BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE
             {
                 return what_;
             }

linx64/include/boost/assign/list_inserter.hpp

@@ -17,7 +17,7 @@
 
 #include <boost/detail/workaround.hpp>
 
-#include <boost/mpl/if.hpp>
+#include <boost/type_traits/conditional.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
@@ -213,9 +213,10 @@ namespace assign
         struct n_arg_type        {};
         struct repeater_arg_type {};
 
-        typedef BOOST_DEDUCED_TYPENAME mpl::if_c< is_same<Argument,assign_detail::forward_n_arguments>::value,
-                                                  n_arg_type,
-                                                  single_arg_type >::type arg_type;  
+        typedef BOOST_DEDUCED_TYPENAME ::boost::conditional<
+            is_same<Argument,assign_detail::forward_n_arguments>::value,
+            n_arg_type,
+            single_arg_type >::type arg_type;  
             
     public:
         
@@ -293,7 +294,8 @@ namespace assign
         template< class T >
         list_inserter& operator,(T&& r)
         {
-            typedef BOOST_DEDUCED_TYPENAME mpl::if_c< assign_detail::is_repeater< T >::value,
+            typedef BOOST_DEDUCED_TYPENAME ::boost::conditional<
+                assign_detail::is_repeater< T >::value,
                 repeater_arg_type,
                 arg_type >::type tag;
 
@@ -305,7 +307,8 @@ namespace assign
         template< class T >
         list_inserter& operator,(T&& r)
         {
-            typedef BOOST_DEDUCED_TYPENAME mpl::if_c< assign_detail::is_repeater< T >::value,
+            typedef BOOST_DEDUCED_TYPENAME ::boost::conditional<
+                assign_detail::is_repeater< T >::value,
                 repeater_arg_type,
                 arg_type >::type tag;
 

linx64/include/boost/assign/list_of.hpp

@@ -25,12 +25,12 @@
 #include <boost/type_traits/is_reference.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/throw_exception.hpp>
+#include <boost/type_traits/conditional.hpp>
 #include <boost/type_traits/detail/yes_no_type.hpp>
 #include <boost/type_traits/decay.hpp>
 #include <boost/type_traits/is_array.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/utility/declval.hpp>
-#include <boost/mpl/if.hpp>
 #include <boost/move/utility.hpp>
 #include <deque>
 #include <cstddef>
@@ -56,7 +56,7 @@
 
 #endif
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 // BCB requires full type definition for is_array<> to work correctly.
 #include <boost/array.hpp>
 #endif
@@ -65,7 +65,7 @@ namespace boost
 {
 
 // this here is necessary to avoid compiler error in <boost/array.hpp>
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
     template< class T, std::size_t sz >
     class array;
 #endif
@@ -83,10 +83,10 @@ namespace assign_detail
         // Add constness to array parameters
         // to support string literals properly
         //
-        typedef BOOST_DEDUCED_TYPENAME mpl::eval_if<
-            ::boost::is_array<T>,
+        typedef BOOST_DEDUCED_TYPENAME ::boost::conditional<
+            ::boost::is_array<T>::value,
             ::boost::decay<const T>,
-            ::boost::decay<T> >::type type;
+            ::boost::decay<T> >::type::type type;
     };
 
     template< class T, std::size_t sz >
@@ -104,28 +104,28 @@ namespace assign_detail
 
     struct array_type_tag
     {
-    #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+    #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
     private:
       char dummy_;  // BCB would by default use 8 bytes
     #endif
     };
     struct adapter_type_tag
     {
-    #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+    #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
     private:
       char dummy_;  // BCB would by default use 8 bytes
     #endif
     };
     struct pair_type_tag
     {
-    #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+    #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
     private:
       char dummy_;  // BCB would by default use 8 bytes
     #endif
     };
     struct default_type_tag
     {
-    #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+    #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
     private:
       char dummy_;  // BCB would by default use 8 bytes
     #endif
@@ -165,7 +165,7 @@ namespace assign_detail
             BOOST_STATIC_CONSTANT( bool, is_array_flag = sizeof( assign_detail::assign_is_array( c ) )
                                    == sizeof( type_traits::yes_type ) );
 
-            typedef BOOST_DEDUCED_TYPENAME mpl::if_c< is_array_flag,
+            typedef BOOST_DEDUCED_TYPENAME ::boost::conditional< is_array_flag,
                                                       array_type_tag,
                                              default_type_tag >::type tag_type;
 

linx64/include/boost/assign/ptr_list_of.hpp

@@ -24,7 +24,6 @@
 #include <boost/type_traits/detail/yes_no_type.hpp>
 #include <boost/type_traits/decay.hpp>
 #include <boost/type_traits/is_array.hpp>
-#include <boost/mpl/if.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/move/utility.hpp>