Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r50968 - in sandbox/thread_safe_signals/trunk: boost/signals2 libs/signals2/test
From: fmhess_at_[hidden]
Date: 2009-02-02 11:51:19


Author: fmhess
Date: 2009-02-02 11:51:18 EST (Mon, 02 Feb 2009)
New Revision: 50968
URL: http://svn.boost.org/trac/boost/changeset/50968

Log:
Fixed return type for 0 argument and variadic deconstruct overloads.

Text files modified:
   sandbox/thread_safe_signals/trunk/boost/signals2/deconstruct.hpp | 4 ++--
   sandbox/thread_safe_signals/trunk/libs/signals2/test/deconstruct_test.cpp | 4 ++--
   2 files changed, 4 insertions(+), 4 deletions(-)

Modified: sandbox/thread_safe_signals/trunk/boost/signals2/deconstruct.hpp
==============================================================================
--- sandbox/thread_safe_signals/trunk/boost/signals2/deconstruct.hpp (original)
+++ sandbox/thread_safe_signals/trunk/boost/signals2/deconstruct.hpp 2009-02-02 11:51:18 EST (Mon, 02 Feb 2009)
@@ -421,7 +421,7 @@
 //
 // Used even when variadic templates are available because of the new T() vs new T issue
 
-template< class T > boost::shared_ptr< T > deconstruct()
+template< class T > postconstructor_invoker<T> deconstruct()
 {
         return detail::deconstruct_access::deconstruct<T>();
 }
@@ -430,7 +430,7 @@
 
 // Variadic templates, rvalue reference
 
-template< class T, class... Args > boost::shared_ptr< T > deconstruct( Args && ... args )
+template< class T, class... Args > postconstructor_invoker< T > deconstruct( Args && ... args )
 {
     return detail::deconstruct_access::deconstruct( detail::forward<Args>( args )... );
 }

Modified: sandbox/thread_safe_signals/trunk/libs/signals2/test/deconstruct_test.cpp
==============================================================================
--- sandbox/thread_safe_signals/trunk/libs/signals2/test/deconstruct_test.cpp (original)
+++ sandbox/thread_safe_signals/trunk/libs/signals2/test/deconstruct_test.cpp 2009-02-02 11:51:18 EST (Mon, 02 Feb 2009)
@@ -104,7 +104,7 @@
     int value;
   private:
     friend class boost::signals2::deconstruct_access;
- A(int value_in):
+ A(int value_in = 0):
       value(value_in),
       _postconstructed(false),
       _predestructed(false)
@@ -151,7 +151,7 @@
     BOOST_CHECK(a->value == 3);
   }
   {// passing arguments to postconstructor
- boost::shared_ptr<mytest::A> a = boost::signals2::deconstruct<mytest::A>(1).postconstruct(2);
+ boost::shared_ptr<mytest::A> a = boost::signals2::deconstruct<mytest::A>().postconstruct(2);
     BOOST_CHECK(a->value == 2);
   }
 }


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk