feedc0de/boost_smart_ptr
1
0
Fork 0
forked from boostorg/smart_ptr
Code Pull Requests Activity

Merge [69245] to release. Fixes #4433.

Browse Source 
[SVN r70434]
This commit is contained in:
Peter Dimov
2011-03-22 23:23:44 +00:00
parent 445e8d1728
commit 1086aff971
2 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/boost/smart_ptr/intrusive_ptr.hpp
View File

@ -15,11 +15,6 @@
#include <boost/config.hpp>
#ifdef BOOST_MSVC // moved here to work around VC++ compiler crash
# pragma warning(push)
# pragma warning(disable:4284) // odd return type for operator->
#endif
#include <boost/assert.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/smart_ptr/detail/sp_convertible.hpp>
@ -292,8 +287,4 @@ template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::
} // namespace boost
#ifdef BOOST_MSVC
# pragma warning(pop)
#endif
#endif // #ifndef BOOST_SMART_PTR_INTRUSIVE_PTR_HPP_INCLUDED

9
include/boost/smart_ptr/shared_ptr.hpp
View File

@ -50,11 +50,6 @@
#endif
#endif
#ifdef BOOST_MSVC // moved here to work around VC++ compiler crash
# pragma warning(push)
# pragma warning(disable:4284) // odd return type for operator->
#endif
namespace boost
{
@ -692,10 +687,6 @@ template<class T> inline bool atomic_compare_exchange_explicit( shared_ptr<T> *
} // namespace boost
#ifdef BOOST_MSVC
# pragma warning(pop)
#endif
#endif // #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES)
#endif // #ifndef BOOST_SMART_PTR_SHARED_PTR_HPP_INCLUDED