[Boost-commit] svn:boost r76221 - in branches/release: . boost boost/smart_ptr

Subject: [Boost-commit] svn:boost r76221 - in branches/release: . boost boost/smart_ptr
From: pdimov_at_[hidden]
Date: 2011-12-29 17:43:03

Author: pdimov
Date: 2011-12-29 17:43:02 EST (Thu, 29 Dec 2011)
New Revision: 76221
URL: http://svn.boost.org/trac/boost/changeset/76221

Log:
Merge [76219] to release. Fixes #6332.
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
Text files modified: 
   branches/release/boost/smart_ptr/weak_ptr.hpp |     9 ---------                               
   1 files changed, 0 insertions(+), 9 deletions(-)

Modified: branches/release/boost/smart_ptr/weak_ptr.hpp
==============================================================================
--- branches/release/boost/smart_ptr/weak_ptr.hpp	(original)
+++ branches/release/boost/smart_ptr/weak_ptr.hpp	2011-12-29 17:43:02 EST (Thu, 29 Dec 2011)
@@ -17,11 +17,6 @@
 #include <boost/smart_ptr/detail/shared_count.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
 {
 
@@ -244,8 +239,4 @@
 
 } // namespace boost
 
-#ifdef BOOST_MSVC
-# pragma warning(pop)
-#endif    
-
 #endif  // #ifndef BOOST_SMART_PTR_WEAK_PTR_HPP_INCLUDED