From 3090f6f4affb22ec8f5698e93ec8db9323667726 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 29 Dec 2011 22:43:02 +0000 Subject: [PATCH] Merge [76219] to release. Fixes #6332. [SVN r76221] --- include/boost/smart_ptr/weak_ptr.hpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/include/boost/smart_ptr/weak_ptr.hpp b/include/boost/smart_ptr/weak_ptr.hpp index 3dfae07..2e35583 100644 --- a/include/boost/smart_ptr/weak_ptr.hpp +++ b/include/boost/smart_ptr/weak_ptr.hpp @@ -17,11 +17,6 @@ #include #include -#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 { @@ -244,8 +239,4 @@ template void swap(weak_ptr & a, weak_ptr & b) } // namespace boost -#ifdef BOOST_MSVC -# pragma warning(pop) -#endif - #endif // #ifndef BOOST_SMART_PTR_WEAK_PTR_HPP_INCLUDED