Imported Upstream version 1.57.0upstream/1.57.0

5 files changed, 3 insertions, 31 deletions

diff --git a/boost/signals/connection.hpp b/boost/signals/connection.hpp
index 48493aabf9..1ede6be7a1 100644
--- a/boost/signals/connection.hpp
+++ b/boost/signals/connection.hpp
@@ -132,7 +132,7 @@ namespace boost {
 
       connection release();
 
-      inline void swap(scoped_connection&);
+      void swap(scoped_connection&);
 
       scoped_connection& operator=(const connection&);
       scoped_connection& operator=(const scoped_connection&);
diff --git a/boost/signals/detail/named_slot_map.hpp b/boost/signals/detail/named_slot_map.hpp
index 763013fde1..3f7cf1c5c2 100644
--- a/boost/signals/detail/named_slot_map.hpp
+++ b/boost/signals/detail/named_slot_map.hpp
@@ -13,7 +13,6 @@
 #include <boost/signals/detail/config.hpp>
 #include <boost/signals/detail/signals_common.hpp>
 #include <boost/signals/connection.hpp>
-#include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/function/function2.hpp>
 #include <boost/iterator/iterator_facade.hpp>
@@ -127,7 +126,7 @@ public:
         || slot_ == other.slot_));
   }
 
-#if BOOST_WORKAROUND(_MSC_VER, <= 1600)
+#if BOOST_WORKAROUND(_MSC_VER, <= 1900)
   void decrement();
   void advance(difference_type);
 #endif
diff --git a/boost/signals/detail/signal_base.hpp b/boost/signals/detail/signal_base.hpp
index 0438cf7bae..991e9fcaa4 100644
--- a/boost/signals/detail/signal_base.hpp
+++ b/boost/signals/detail/signal_base.hpp
@@ -17,7 +17,7 @@
 #include <boost/signals/trackable.hpp>
 #include <boost/signals/slot.hpp>
 #include <boost/smart_ptr.hpp>
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 #include <boost/function/function2.hpp>
 #include <utility>
 #include <vector>
diff --git a/boost/signals/detail/signals_common.hpp b/boost/signals/detail/signals_common.hpp
index fe1a5a13ba..9cf078d70f 100644
--- a/boost/signals/detail/signals_common.hpp
+++ b/boost/signals/detail/signals_common.hpp
@@ -97,7 +97,6 @@ namespace boost {
       };
 
       // Determine if the incoming argument is a reference_wrapper
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
       template<typename T>
       struct is_ref
       {
@@ -109,23 +108,6 @@ namespace boost {
       {
         BOOST_STATIC_CONSTANT(bool, value = true);
       };
-#else // no partial specialization
-      typedef char yes_type;
-      typedef double no_type;
-
-      no_type is_ref_tester(...);
-
-      template<typename T>
-      yes_type is_ref_tester(reference_wrapper<T>*);
-
-      template<typename T>
-      struct is_ref
-      {
-        static T* t;
-        BOOST_STATIC_CONSTANT(bool,
-          value = (sizeof(is_ref_tester(t)) == sizeof(yes_type)));
-      };
-#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
       // A slot can be a signal, a reference to a function object, or a
       // function object.
diff --git a/boost/signals/signal_template.hpp b/boost/signals/signal_template.hpp
index 6b0b91a8e6..94e1d1aad3 100644
--- a/boost/signals/signal_template.hpp
+++ b/boost/signals/signal_template.hpp
@@ -16,7 +16,6 @@
 #define BOOST_SIGNALS_SIGNAL_TEMPLATE_HEADER_INCLUDED
 #  include <boost/config.hpp>
 #  include <boost/signals/connection.hpp>
-#  include <boost/utility.hpp>
 #  include <boost/ref.hpp>
 #  include <boost/signals/slot.hpp>
 #  include <boost/last_value.hpp>
@@ -210,13 +209,6 @@ namespace boost {
             BOOST_SIGNALS_NAMESPACE::connect_position at
               = BOOST_SIGNALS_NAMESPACE::at_back);
 
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-    // MSVC 6.0 and 7.0 don't handle the is_convertible test well
-    void disconnect(const group_type& group)
-    {
-      impl->disconnect(group);
-    }
-#else
     template<typename T>
     void disconnect(const T& t)
     {
@@ -242,7 +234,6 @@ namespace boost {
         if (s == f) i->first.disconnect();
       }
     }
-#endif
 
   public: