Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-19 20:22:58 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-20 13:49:33 (GMT) |
| commit | 6b22dfcf59474dd016a0355a3102a1dd3692d92c (patch) | |
| tree | 2b1fd33be433a91e81fee84fdc2bf1b52575d934 /3rdParty/Boost/src/boost/get_pointer.hpp | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.tar.bz2 | |
Update Boost in 3rdParty to version 1.56.0.
This updates Boost in our 3rdParty directory to version 1.56.0.
Updated our update.sh script to stop on error.
Changed error reporting in SwiftTools/CrashReporter.cpp to SWIFT_LOG due to
missing include of <iostream> with newer Boost.
Change-Id: I4b35c77de951333979a524097f35f5f83d325edc
Diffstat (limited to '3rdParty/Boost/src/boost/get_pointer.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/get_pointer.hpp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/3rdParty/Boost/src/boost/get_pointer.hpp b/3rdParty/Boost/src/boost/get_pointer.hpp index a0cd5c0..b27b98a 100644 --- a/3rdParty/Boost/src/boost/get_pointer.hpp +++ b/3rdParty/Boost/src/boost/get_pointer.hpp @@ -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 @@ template<class T> T * get_pointer(std::auto_ptr<T> const& p) 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 |