Merge [76219] to release. Fixes #6332.

[SVN r76221]
This commit is contained in:
Peter Dimov
2011-12-29 22:43:02 +00:00
parent 40073ef64f
commit 3090f6f4af

View File

@ -17,11 +17,6 @@
#include <boost/smart_ptr/detail/shared_count.hpp> #include <boost/smart_ptr/detail/shared_count.hpp>
#include <boost/smart_ptr/shared_ptr.hpp> #include <boost/smart_ptr/shared_ptr.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
namespace boost namespace boost
{ {
@ -244,8 +239,4 @@ template<class T> void swap(weak_ptr<T> & a, weak_ptr<T> & b)
} // namespace boost } // namespace boost
#ifdef BOOST_MSVC
# pragma warning(pop)
#endif
#endif // #ifndef BOOST_SMART_PTR_WEAK_PTR_HPP_INCLUDED #endif // #ifndef BOOST_SMART_PTR_WEAK_PTR_HPP_INCLUDED