Merge [69245] to release. Fixes #4433.

[SVN r70434]
This commit is contained in:
Peter Dimov committed 2011-03-22 23:23:44 +00:00
1 parent 445e8d1728
commit 1086aff971
2 files changed
-18

No files matched your search

-9
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