[Boost-commit] svn:boost r60426 - branches/release/boost/signals2

Subject: [Boost-commit] svn:boost r60426 - branches/release/boost/signals2
From: fmhess_at_[hidden]
Date: 2010-03-10 10:56:41

Author: fmhess
Date: 2010-03-10 10:56:41 EST (Wed, 10 Mar 2010)
New Revision: 60426
URL: http://svn.boost.org/trac/boost/changeset/60426

Log:
Merged [60383] to release branch.  Fixes #3983.

Added:
   branches/release/boost/signals2/expired_slot.hpp
      - copied unchanged from r60383, /trunk/boost/signals2/expired_slot.hpp
Properties modified: 
   branches/release/boost/signals2/   (props changed)
Text files modified: 
   branches/release/boost/signals2/last_value.hpp          |     2 +-                                      
   branches/release/boost/signals2/optional_last_value.hpp |     2 +-                                      
   branches/release/boost/signals2/slot_base.hpp           |    10 +---------                              
   3 files changed, 3 insertions(+), 11 deletions(-)

Modified: branches/release/boost/signals2/last_value.hpp
==============================================================================
--- branches/release/boost/signals2/last_value.hpp	(original)
+++ branches/release/boost/signals2/last_value.hpp	2010-03-10 10:56:41 EST (Wed, 10 Mar 2010)
@@ -12,12 +12,12 @@
 #define BOOST_SIGNALS2_LAST_VALUE_HPP
 
 #include <boost/optional.hpp>
+#include <boost/signals2/expired_slot.hpp>
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 
 namespace boost {
   namespace signals2 {
-    class expired_slot;
 
     // no_slots_error is thrown when we are unable to generate a return value
     // due to no slots being connected to the signal.

Modified: branches/release/boost/signals2/optional_last_value.hpp
==============================================================================
--- branches/release/boost/signals2/optional_last_value.hpp	(original)
+++ branches/release/boost/signals2/optional_last_value.hpp	2010-03-10 10:56:41 EST (Wed, 10 Mar 2010)
@@ -12,10 +12,10 @@
 #define BOOST_SIGNALS2_OPTIONAL_LAST_VALUE_HPP
 
 #include <boost/optional.hpp>
+#include <boost/signals2/expired_slot.hpp>
 
 namespace boost {
   namespace signals2 {
-    class expired_slot;
 
     template<typename T>
       class optional_last_value

Modified: branches/release/boost/signals2/slot_base.hpp
==============================================================================
--- branches/release/boost/signals2/slot_base.hpp	(original)
+++ branches/release/boost/signals2/slot_base.hpp	2010-03-10 10:56:41 EST (Wed, 10 Mar 2010)
@@ -14,6 +14,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
+#include <boost/signals2/expired_slot.hpp>
 #include <boost/signals2/signal_base.hpp>
 #include <boost/throw_exception.hpp>
 #include <vector>
@@ -27,15 +28,6 @@
       class tracked_objects_visitor;
     }
 
-    class expired_slot: public bad_weak_ptr
-    {
-    public:
-      virtual char const * what() const throw()
-      {
-        return "boost::signals2::expired_slot";
-      }
-    };
-
     class slot_base
     {
     public: