boost: update to 1.42.0

[features.git] / boost / boost / bind / bind.hpp

diff --git a/boost/boost/bind/bind.hpp b/boost/boost/bind/bind.hpp
index 1e5c9e032490ed8b2ed2ff3469fcd7053e48cd10..a63d2a026b90a009aaf62cc8bb26a962aa4e1e08 100644 (file)
--- a/boost/boost/bind/bind.hpp
+++ b/boost/boost/bind/bind.hpp
@@ -207,6 +207,13 @@ public:
     }
 };
 
+#ifdef BOOST_MSVC
+// MSVC is bright enough to realise that the parameter rhs 
+// in operator==may be unused for some template argument types:
+#pragma warning(push)
+#pragma warning(disable:4100)
+#endif
+
 template< class A1 > class list1: private storage1< A1 >
 {
 private:
@@ -846,6 +853,10 @@ public:
     }
 };
 
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+
 // bind_t
 
 #ifndef BOOST_NO_VOID_RETURNS
@@ -1629,7 +1640,7 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
 // data member pointers
 
 #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
-    || ( defined(__BORLANDC__) && BOOST_WORKAROUND( __BORLANDC__, <= 0x610 ) )
+    || ( defined(__BORLANDC__) && BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x620 ) ) )
 
 template<class R, class T, class A1>
 _bi::bind_t< R, _mfi::dm<R, T>, typename _bi::list_av_1<A1>::type >
@@ -1654,7 +1665,14 @@ template< class M, class T > struct add_cref< M T::*, 0 >
 
 template< class M, class T > struct add_cref< M T::*, 1 >
 {
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4180)
+#endif
     typedef M const & type;
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
 };
 
 template< class R, class T > struct add_cref< R (T::*) (), 1 >