[Boost-commit] svn:boost r48941 - sandbox/thread_safe_signals/trunk/boost/signals2

Subject: [Boost-commit] svn:boost r48941 - sandbox/thread_safe_signals/trunk/boost/signals2
From: fmhess_at_[hidden]
Date: 2008-09-24 10:21:03

Author: fmhess
Date: 2008-09-24 10:21:03 EDT (Wed, 24 Sep 2008)
New Revision: 48941
URL: http://svn.boost.org/trac/boost/changeset/48941

Log:
Fixed some issues caused by header and namespace rearrangements

Text files modified: 
   sandbox/thread_safe_signals/trunk/boost/signals2/deconstruct_ptr.hpp   |    20 ++++++++++----------                    
   sandbox/thread_safe_signals/trunk/boost/signals2/postconstructible.hpp |     6 +++---                                  
   2 files changed, 13 insertions(+), 13 deletions(-)

Modified: sandbox/thread_safe_signals/trunk/boost/signals2/deconstruct_ptr.hpp
==============================================================================
--- sandbox/thread_safe_signals/trunk/boost/signals2/deconstruct_ptr.hpp	(original)
+++ sandbox/thread_safe_signals/trunk/boost/signals2/deconstruct_ptr.hpp	2008-09-24 10:21:03 EDT (Wed, 24 Sep 2008)
@@ -14,19 +14,19 @@
 #define BOOST_DECONSTRUCT_PTR_HEADER
 
 #include <boost/checked_delete.hpp>
-#include <boost/postconstructible.hpp>
-#include <boost/predestructible.hpp>
+#include <boost/signals2/postconstructible.hpp>
+#include <boost/signals2/predestructible.hpp>
 #include <boost/shared_ptr.hpp>
 
 namespace boost
 {
   namespace signals2
   {
-    namespace deconstruct_detail
+    namespace detail
     {
-      extern inline void do_postconstruct(const boost::postconstructible *ptr)
+      extern inline void do_postconstruct(const postconstructible *ptr)
       {
-        boost::postconstructible *nonconst_ptr = const_cast<boost::postconstructible*>(ptr);
+        postconstructible *nonconst_ptr = const_cast<postconstructible*>(ptr);
         nonconst_ptr->postconstruct();
       }
       extern inline void do_postconstruct(...)
@@ -45,9 +45,9 @@
       static void m_predestruct(...)
       {
       }
-      static void m_predestruct(const boost::predestructible *ptr)
+      static void m_predestruct(const predestructible *ptr)
       {
-        boost::predestructible *nonconst_ptr = const_cast<boost::predestructible*>(ptr);
+        predestructible *nonconst_ptr = const_cast<predestructible*>(ptr);
         nonconst_ptr->predestruct();
       }
     };
@@ -56,8 +56,8 @@
     shared_ptr<T> deconstruct_ptr(T *ptr)
     {
       if(ptr == 0) return shared_ptr<T>(ptr);
-      shared_ptr<T> shared(ptr, boost::predestructing_deleter<T>());
-      deconstruct_detail::do_postconstruct(ptr);
+      shared_ptr<T> shared(ptr, boost::signals2::predestructing_deleter<T>());
+      detail::do_postconstruct(ptr);
       return shared;
     }
     template<typename T, typename D>
@@ -65,7 +65,7 @@
     {
       shared_ptr<T> shared(ptr, deleter);
       if(ptr == 0) return shared;
-      deconstruct_detail::do_postconstruct(ptr);
+      detail::do_postconstruct(ptr);
       return shared;
     }
   }

Modified: sandbox/thread_safe_signals/trunk/boost/signals2/postconstructible.hpp
==============================================================================
--- sandbox/thread_safe_signals/trunk/boost/signals2/postconstructible.hpp	(original)
+++ sandbox/thread_safe_signals/trunk/boost/signals2/postconstructible.hpp	2008-09-24 10:21:03 EDT (Wed, 24 Sep 2008)
@@ -19,15 +19,15 @@
   namespace signals2
   {
     class postconstructible;
-    namespace deconstruct_detail
+    namespace detail
     {
-      void do_postconstruct(const boost::postconstructible *ptr);
+      void do_postconstruct(const boost::signals2::postconstructible *ptr);
     }
 
     class postconstructible
     {
     public:
-      friend void deconstruct_detail::do_postconstruct(const boost::postconstructible *ptr);
+      friend void detail::do_postconstruct(const boost::signals2::postconstructible *ptr);
     protected:
       postconstructible() {}
       virtual ~postconstructible() {}