Index: boost/smart_ptr/intrusive_ptr.hpp
===================================================================
--- boost/smart_ptr/intrusive_ptr.hpp	(revision 67261)
+++ boost/smart_ptr/intrusive_ptr.hpp	(working copy)
@@ -15,7 +15,7 @@
 
 #include <boost/config.hpp>
 
-#ifdef BOOST_MSVC  // moved here to work around VC++ compiler crash
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1600)  // moved here to work around VC++ compiler crash
 # pragma warning(push)
 # pragma warning(disable:4284) // odd return type for operator->
 #endif
@@ -292,7 +292,7 @@
 
 } // namespace boost
 
-#ifdef BOOST_MSVC
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1600)
 # pragma warning(pop)
 #endif    
 
Index: boost/smart_ptr/shared_ptr.hpp
===================================================================
--- boost/smart_ptr/shared_ptr.hpp	(revision 67261)
+++ boost/smart_ptr/shared_ptr.hpp	(working copy)
@@ -50,7 +50,7 @@
 #endif
 #endif
 
-#ifdef BOOST_MSVC  // moved here to work around VC++ compiler crash
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1600) // moved here to work around VC++ compiler crash
 # pragma warning(push)
 # pragma warning(disable:4284) // odd return type for operator->
 #endif
@@ -731,7 +731,7 @@
 
 } // namespace boost
 
-#ifdef BOOST_MSVC
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1600)
 # pragma warning(pop)
 #endif