[Boost-commit] svn:boost r81329 - in branches/release: . boost

Subject: [Boost-commit] svn:boost r81329 - in branches/release: . boost
From: pdimov_at_[hidden]
Date: 2012-11-14 06:20:30

Author: pdimov
Date: 2012-11-14 06:20:29 EST (Wed, 14 Nov 2012)
New Revision: 81329
URL: http://svn.boost.org/trac/boost/changeset/81329

Log:
Merged [81125] from trunk. Fixes #4185.
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
Text files modified: 
   branches/release/boost/get_pointer.hpp |    19 +++++++++++++++++--                     
   1 files changed, 17 insertions(+), 2 deletions(-)

Modified: branches/release/boost/get_pointer.hpp
==============================================================================
--- branches/release/boost/get_pointer.hpp	(original)
+++ branches/release/boost/get_pointer.hpp	2012-11-14 06:20:29 EST (Wed, 14 Nov 2012)
@@ -3,13 +3,15 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 #ifndef GET_POINTER_DWA20021219_HPP
-# define GET_POINTER_DWA20021219_HPP
+#define GET_POINTER_DWA20021219_HPP
+
+#include <boost/config.hpp>
 
 // In order to avoid circular dependencies with Boost.TR1
 // we make sure that our include of <memory> doesn't try to
 // pull in the TR1 headers: that's why we use this header 
 // rather than including <memory> directly:
-# include <boost/config/no_tr1/memory.hpp>  // std::auto_ptr
+#include <boost/config/no_tr1/memory.hpp>  // std::auto_ptr
 
 namespace boost { 
 
@@ -27,6 +29,19 @@
     return p.get();
 }
 
+#if !defined( BOOST_NO_CXX11_SMART_PTR )
+
+template<class T> T * get_pointer( std::unique_ptr<T> const& p )
+{
+    return p.get();
+}
+
+template<class T> T * get_pointer( std::shared_ptr<T> const& p )
+{
+    return p.get();
+}
+
+#endif
 
 } // namespace boost