diff options
author | Kevin Smith <git@kismith.co.uk> | 2012-08-02 20:41:55 (GMT) |
---|---|---|
committer | Kevin Smith <git@kismith.co.uk> | 2012-08-02 21:03:09 (GMT) |
commit | d5ace22054203c7989691ae8b3fa4e4784d1b57e (patch) | |
tree | 64d400cdb10644967df183d0f202fcbf8160a773 /3rdParty/Boost/src/boost/asio/detail/shared_ptr.hpp | |
parent | 6f26d9aa86f0909af13b23b1a925b8d492e74154 (diff) | |
download | swift-contrib-d5ace22054203c7989691ae8b3fa4e4784d1b57e.zip swift-contrib-d5ace22054203c7989691ae8b3fa4e4784d1b57e.tar.bz2 |
Add two extra Boost dependencies, upgrade to 1.47.0ks/boost1.47
Diffstat (limited to '3rdParty/Boost/src/boost/asio/detail/shared_ptr.hpp')
-rw-r--r-- | 3rdParty/Boost/src/boost/asio/detail/shared_ptr.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/3rdParty/Boost/src/boost/asio/detail/shared_ptr.hpp b/3rdParty/Boost/src/boost/asio/detail/shared_ptr.hpp index fe497b7..8f181d8 100644 --- a/3rdParty/Boost/src/boost/asio/detail/shared_ptr.hpp +++ b/3rdParty/Boost/src/boost/asio/detail/shared_ptr.hpp @@ -17,21 +17,21 @@ #include <boost/asio/detail/config.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/shared_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::shared_ptr; -#else +#else // defined(BOOST_ASIO_HAS_STD_SHARED_PTR) using boost::shared_ptr; -#endif +#endif // defined(BOOST_ASIO_HAS_STD_SHARED_PTR) } // namespace detail } // namespace asio |