feedc0de/boost_smart_ptr
1
0
Fork 0
forked from boostorg/smart_ptr
Code Pull Requests Activity

Move MS VC++ pragmas to workaround compiler crash reported by several people with SP4 and SP5.

Browse Source 
[SVN r10204]
This commit is contained in:
Beman Dawes
2001-05-23 20:14:15 +00:00
parent a90a157ea6
commit 7c09884eac
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/boost/smart_ptr.hpp
View File

@@ -9,7 +9,8 @@
// See http://www.boost.org for most recent version including documentation. // See http://www.boost.org for most recent version including documentation.
// Revision History // Revision History
// 21 May 01 Require complete type on delete (suggested by Vladimir Prus) // 21 May 01 Require complete type where incomplete type is unsafe.
// (suggested by Vladimir Prus)
// 21 May 01 operator= fails if operand transitively owned by *this, as in a // 21 May 01 operator= fails if operand transitively owned by *this, as in a
// linked list (report by Ken Johnson, fix by Beman Dawes) // linked list (report by Ken Johnson, fix by Beman Dawes)
// 21 Jan 01 Suppress some useless warnings with MSVC (David Abrahams) // 21 Jan 01 Suppress some useless warnings with MSVC (David Abrahams)
@@ -59,6 +60,11 @@
#include <functional> // for std::less #include <functional> // for std::less
#include <boost/static_assert.hpp> // for BOOST_STATIC_ASSERT #include <boost/static_assert.hpp> // for BOOST_STATIC_ASSERT
#ifdef BOOST_MSVC // moved here to work around VC++ compiler crash
# pragma warning(push)
# pragma warning(disable:4284) // return type for 'identifier::operator->' is not a UDT or reference to a UDT. Will produce errors if applied using infix notation
#endif
namespace boost { namespace boost {
// scoped_ptr --------------------------------------------------------------// // scoped_ptr --------------------------------------------------------------//
@@ -80,13 +86,7 @@ template<typename T> class scoped_ptr : noncopyable {
void reset( T* p=0 ) { if ( ptr != p ) { checked_delete(ptr); ptr = p; } } void reset( T* p=0 ) { if ( ptr != p ) { checked_delete(ptr); ptr = p; } }
T& operator*() const { return *ptr; } // never throws T& operator*() const { return *ptr; } // never throws
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
# pragma warning(push)
# pragma warning(disable:4284) // return type for 'identifier::operator->' is not a UDT or reference to a UDT. Will produce errors if applied using infix notation
#endif
T* operator->() const { return ptr; } // never throws T* operator->() const { return ptr; } // never throws
#ifdef BOOST_MSVC
# pragma warning(pop)
#endif
T* get() const { return ptr; } // never throws T* get() const { return ptr; } // never throws
#ifdef BOOST_SMART_PTR_CONVERSION #ifdef BOOST_SMART_PTR_CONVERSION
// get() is safer! Define BOOST_SMART_PTR_CONVERSION at your own risk! // get() is safer! Define BOOST_SMART_PTR_CONVERSION at your own risk!
@@ -216,14 +216,7 @@ template<typename T> class shared_ptr {
} // reset } // reset
T& operator*() const { return *px; } // never throws T& operator*() const { return *px; } // never throws
#ifdef BOOST_MSVC
# pragma warning(push)
# pragma warning(disable:4284) // return type for 'identifier::operator->' is not a UDT or reference to a UDT. Will produce errors if applied using infix notation
#endif
T* operator->() const { return px; } // never throws T* operator->() const { return px; } // never throws
#ifdef BOOST_MSVC
# pragma warning(pop)
#endif
T* get() const { return px; } // never throws T* get() const { return px; } // never throws
#ifdef BOOST_SMART_PTR_CONVERSION #ifdef BOOST_SMART_PTR_CONVERSION
// get() is safer! Define BOOST_SMART_PTR_CONVERSION at your own risk! // get() is safer! Define BOOST_SMART_PTR_CONVERSION at your own risk!
@@ -397,6 +390,10 @@ template<typename T>
#endif // ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION #endif // ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
#ifdef BOOST_MSVC
# pragma warning(pop)
#endif
#endif // BOOST_SMART_PTR_HPP #endif // BOOST_SMART_PTR_HPP