Update to boost 1.68

[features.git] / 3rdparty / boost / boost / signals2 / slot_base.hpp

diff --git a/3rdparty/boost/boost/signals2/slot_base.hpp b/3rdparty/boost/boost/signals2/slot_base.hpp
index a9db4a92d8e501a6a4130796aa2647f439ad28e0..e297180e493f33fbd4d25ff6958b337a19c4c9a7 100644 (file)
--- a/3rdparty/boost/boost/signals2/slot_base.hpp
+++ b/3rdparty/boost/boost/signals2/slot_base.hpp
@@ -17,6 +17,7 @@
 #include <boost/signals2/detail/foreign_ptr.hpp>
 #include <boost/signals2/expired_slot.hpp>
 #include <boost/signals2/signal_base.hpp>
+#include <boost/throw_exception.hpp>
 #include <boost/variant/apply_visitor.hpp>
 #include <boost/variant/variant.hpp>
 #include <vector>
@@ -67,7 +68,6 @@ namespace boost
       typedef std::vector<detail::void_shared_ptr_variant> locked_container_type;
 
       const tracked_container_type& tracked_objects() const {return _tracked_objects;}
-    #ifndef BOOST_NO_EXCEPTIONS
       locked_container_type lock() const
       {
         locked_container_type locked_objects;
@@ -77,12 +77,11 @@ namespace boost
           locked_objects.push_back(apply_visitor(detail::lock_weak_ptr_visitor(), *it));
           if(apply_visitor(detail::expired_weak_ptr_visitor(), *it))
           {
-            throw expired_slot();
+            boost::throw_exception(expired_slot());
           }
         }
         return locked_objects;
       }
-    #endif
       bool expired() const
       {
         tracked_container_type::const_iterator it;