diff options
Diffstat (limited to '3rdParty/Boost/src/boost/asio/detail/weak_ptr.hpp')
-rw-r--r-- | 3rdParty/Boost/src/boost/asio/detail/weak_ptr.hpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/3rdParty/Boost/src/boost/asio/detail/weak_ptr.hpp b/3rdParty/Boost/src/boost/asio/detail/weak_ptr.hpp index 81a8b06..af9a08d 100644 --- a/3rdParty/Boost/src/boost/asio/detail/weak_ptr.hpp +++ b/3rdParty/Boost/src/boost/asio/detail/weak_ptr.hpp @@ -2,7 +2,7 @@ // detail/weak_ptr.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2011 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2012 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -16,23 +16,22 @@ #endif // defined(_MSC_VER) && (_MSC_VER >= 1200) #include <boost/asio/detail/config.hpp> -#include <boost/version.hpp> -#if defined(_MSC_VER) && (_MSC_VER >= 1600) +#if defined(BOOST_ASIO_HAS_STD_SHARED_PTR) # include <memory> -#else +#else // defined(BOOST_ASIO_HAS_STD_SHARED_PTR) # include <boost/weak_ptr.hpp> -#endif +#endif // defined(BOOST_ASIO_HAS_STD_SHARED_PTR) namespace boost { namespace asio { namespace detail { -#if defined(_MSC_VER) && (_MSC_VER >= 1600) +#if defined(BOOST_ASIO_HAS_STD_SHARED_PTR) using std::weak_ptr; -#else +#else // defined(BOOST_ASIO_HAS_STD_SHARED_PTR) using boost::weak_ptr; -#endif +#endif // defined(BOOST_ASIO_HAS_STD_SHARED_PTR) } // namespace detail } // namespace asio |