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

Merge pull request #77 from eldiener/develop

Browse Source 
Changes for Embarcadero C++ clang-based compilers, targeting Boost 1.74
This commit is contained in:
Peter Dimov
2020-05-19 01:57:37 +03:00
committed by GitHub
parent 02cc561248 c6b3700ef1
commit 496127ab99
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extras/src/sp_debug_hooks.cpp
View File

@ -73,7 +73,7 @@ void * operator new(size_t n) throw(bad_alloc)
return p; return p;
} }
#if !defined(__BORLANDC__) || (__BORLANDC__ > 0x551) #if !defined(BOOST_BORLANDC) || (BOOST_BORLANDC > 0x551)
void * operator new(size_t n, nothrow_t const &) throw() void * operator new(size_t n, nothrow_t const &) throw()
{ {
@ -95,7 +95,7 @@ void * operator new[](size_t n) throw(bad_alloc)
return p; return p;
} }
#if !defined(__BORLANDC__) || (__BORLANDC__ > 0x551) #if !defined(BOOST_BORLANDC) || (BOOST_BORLANDC > 0x551)
void * operator new[](size_t n, nothrow_t const &) throw() void * operator new[](size_t n, nothrow_t const &) throw()
{ {
@ -205,7 +205,7 @@ void operator delete(void * p) throw()
free(pm); free(pm);
} }
#if !defined(__BORLANDC__) || (__BORLANDC__ > 0x551) #if !defined(BOOST_BORLANDC) || (BOOST_BORLANDC > 0x551)
void operator delete(void * p, nothrow_t const &) throw() void operator delete(void * p, nothrow_t const &) throw()
{ {
@ -231,7 +231,7 @@ void operator delete[](void * p) throw()
free(pm); free(pm);
} }
#if !defined(__BORLANDC__) || (__BORLANDC__ > 0x551) #if !defined(BOOST_BORLANDC) || (BOOST_BORLANDC > 0x551)
void operator delete[](void * p, nothrow_t const &) throw() void operator delete[](void * p, nothrow_t const &) throw()
{ {

8
include/boost/smart_ptr/bad_weak_ptr.hpp
View File

@ -20,7 +20,7 @@
#include <boost/config.hpp> #include <boost/config.hpp>
#include <exception> #include <exception>
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
# pragma warn -8026 // Functions with excep. spec. are not expanded inline # pragma warn -8026 // Functions with excep. spec. are not expanded inline
#endif #endif
@ -33,7 +33,7 @@ namespace boost
// is compiled with -ps, the compiler issues an error. // is compiled with -ps, the compiler issues an error.
// Hence, the temporary #pragma option -pc below. // Hence, the temporary #pragma option -pc below.
#if defined(__BORLANDC__) && __BORLANDC__ <= 0x564 #if defined(BOOST_BORLANDC) && BOOST_BORLANDC <= 0x564
# pragma option push -pc # pragma option push -pc
#endif #endif
@ -57,13 +57,13 @@ public:
# pragma clang diagnostic pop # pragma clang diagnostic pop
#endif #endif
#if defined(__BORLANDC__) && __BORLANDC__ <= 0x564 #if defined(BOOST_BORLANDC) && BOOST_BORLANDC <= 0x564
# pragma option pop # pragma option pop
#endif #endif
} // namespace boost } // namespace boost
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
# pragma warn .8026 // Functions with excep. spec. are not expanded inline # pragma warn .8026 // Functions with excep. spec. are not expanded inline
#endif #endif

4
include/boost/smart_ptr/detail/shared_count.hpp
View File

@ -18,7 +18,7 @@
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
// //
#ifdef __BORLANDC__ #if defined(__BORLANDC__) && !defined(__clang__)
# pragma warn -8027 // Functions containing try are not expanded inline # pragma warn -8027 // Functions containing try are not expanded inline
#endif #endif
@ -661,7 +661,7 @@ inline shared_count::shared_count( weak_count const & r, sp_nothrow_tag ) BOOST_
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
#ifdef __BORLANDC__ #if defined(__BORLANDC__) && !defined(__clang__)
# pragma warn .8027 // Functions containing try are not expanded inline # pragma warn .8027 // Functions containing try are not expanded inline
#endif #endif

2
include/boost/smart_ptr/detail/sp_convertible.hpp
View File

@ -26,7 +26,7 @@
# define BOOST_SP_NO_SP_CONVERTIBLE # define BOOST_SP_NO_SP_CONVERTIBLE
#endif #endif
#if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) && defined( __BORLANDC__ ) && ( __BORLANDC__ < 0x630 ) #if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) && defined( BOOST_BORLANDC ) && ( BOOST_BORLANDC < 0x630 )
# define BOOST_SP_NO_SP_CONVERTIBLE # define BOOST_SP_NO_SP_CONVERTIBLE
#endif #endif

2
include/boost/smart_ptr/make_shared_object.hpp
View File

@ -187,7 +187,7 @@ template< class T > struct sp_if_not_array< T[] >
{ {
}; };
#if !defined( __BORLANDC__ ) || !BOOST_WORKAROUND( __BORLANDC__, < 0x600 ) #if !defined( BOOST_BORLANDC ) || !BOOST_WORKAROUND( BOOST_BORLANDC, < 0x600 )
template< class T, std::size_t N > struct sp_if_not_array< T[N] > template< class T, std::size_t N > struct sp_if_not_array< T[N] >
{ {

8
include/boost/smart_ptr/shared_ptr.hpp
View File

@ -86,7 +86,7 @@ template< class T > struct sp_element< T[] >
typedef T type; typedef T type;
}; };
#if !defined( __BORLANDC__ ) || !BOOST_WORKAROUND( __BORLANDC__, < 0x600 ) #if !defined( BOOST_BORLANDC ) || !BOOST_WORKAROUND( BOOST_BORLANDC, < 0x600 )
template< class T, std::size_t N > struct sp_element< T[N] > template< class T, std::size_t N > struct sp_element< T[N] >
{ {
@ -135,7 +135,7 @@ template< class T > struct sp_dereference< T[] >
typedef void type; typedef void type;
}; };
#if !defined( __BORLANDC__ ) || !BOOST_WORKAROUND( __BORLANDC__, < 0x600 ) #if !defined( BOOST_BORLANDC ) || !BOOST_WORKAROUND( BOOST_BORLANDC, < 0x600 )
template< class T, std::size_t N > struct sp_dereference< T[N] > template< class T, std::size_t N > struct sp_dereference< T[N] >
{ {
@ -160,7 +160,7 @@ template< class T > struct sp_member_access< T[] >
typedef void type; typedef void type;
}; };
#if !defined( __BORLANDC__ ) || !BOOST_WORKAROUND( __BORLANDC__, < 0x600 ) #if !defined( BOOST_BORLANDC ) || !BOOST_WORKAROUND( BOOST_BORLANDC, < 0x600 )
template< class T, std::size_t N > struct sp_member_access< T[N] > template< class T, std::size_t N > struct sp_member_access< T[N] >
{ {
@ -185,7 +185,7 @@ template< class T > struct sp_array_access< T[] >
typedef T & type; typedef T & type;
}; };
#if !defined( __BORLANDC__ ) || !BOOST_WORKAROUND( __BORLANDC__, < 0x600 ) #if !defined( BOOST_BORLANDC ) || !BOOST_WORKAROUND( BOOST_BORLANDC, < 0x600 )
template< class T, std::size_t N > struct sp_array_access< T[N] > template< class T, std::size_t N > struct sp_array_access< T[N] >
{ {

2
test/smart_ptr_test.cpp
View File

@ -31,7 +31,7 @@
#endif #endif
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
# pragma warn -8092 // template argument passed to 'find' is not an iterator # pragma warn -8092 // template argument passed to 'find' is not an iterator
#endif #endif