diff options
Diffstat (limited to 'boost/signals2/detail/foreign_ptr.hpp')
| -rw-r--r-- | boost/signals2/detail/foreign_ptr.hpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/boost/signals2/detail/foreign_ptr.hpp b/boost/signals2/detail/foreign_ptr.hpp index 47c5996205..4349b38e6f 100644 --- a/boost/signals2/detail/foreign_ptr.hpp +++ b/boost/signals2/detail/foreign_ptr.hpp @@ -18,14 +18,7 @@ #include <boost/smart_ptr/bad_weak_ptr.hpp> #include <boost/utility/swap.hpp> -//FIXME: this is a hack to deal with the fact BOOST_NO_CXX_SMART_PTR doesn't -// exist yet in boost.config. It will fail on a library which implements -// C++11 std::tuple but not std::shared_ptr and std::weak_ptr. -#ifdef BOOST_NO_CXX11_HDR_TUPLE -#define BOOST_SIGNALS2_NO_CXX11_SMART_PTR -#endif - -#ifndef BOOST_SIGNALS2_NO_CXX11_SMART_PTR +#ifndef BOOST_NO_CXX11_SMART_PTR #include <memory> #endif @@ -42,7 +35,7 @@ namespace boost { typedef boost::shared_ptr<T> shared_type; }; -#ifndef BOOST_SIGNALS2_NO_CXX11_SMART_PTR +#ifndef BOOST_NO_CXX11_SMART_PTR template<typename T> struct weak_ptr_traits<std::weak_ptr<T> > { typedef std::shared_ptr<T> shared_type; @@ -56,7 +49,7 @@ namespace boost { typedef boost::weak_ptr<T> weak_type; }; -#ifndef BOOST_SIGNALS2_NO_CXX11_SMART_PTR +#ifndef BOOST_NO_CXX11_SMART_PTR template<typename T> struct shared_ptr_traits<std::shared_ptr<T> > { typedef std::weak_ptr<T> weak_type; |