mirror of
https://github.com/boostorg/core.git
synced 2025-07-31 13:27:29 +02:00
Change __BORLANDC__ to BOOST_BORLANDC, which is defined in Boost config for the Embarcadero non-clang-based compilers.
This commit is contained in:
committed by
Andrey Semashev
parent
d3a64554f4
commit
6444de7098
@@ -125,7 +125,7 @@ template<class T>
|
|||||||
BOOST_FORCEINLINE T*
|
BOOST_FORCEINLINE T*
|
||||||
addressof(T& o) BOOST_NOEXCEPT
|
addressof(T& o) BOOST_NOEXCEPT
|
||||||
{
|
{
|
||||||
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) || \
|
#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) || \
|
||||||
BOOST_WORKAROUND(__SUNPRO_CC, <= 0x5120)
|
BOOST_WORKAROUND(__SUNPRO_CC, <= 0x5120)
|
||||||
return boost::detail::addrof<T>::get(o, 0);
|
return boost::detail::addrof<T>::get(o, 0);
|
||||||
#else
|
#else
|
||||||
@@ -151,7 +151,7 @@ addressof(T (&o)[N]) BOOST_NOEXCEPT
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
|
#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
|
||||||
template<class T, std::size_t N>
|
template<class T, std::size_t N>
|
||||||
BOOST_FORCEINLINE
|
BOOST_FORCEINLINE
|
||||||
T (*addressof(T (&o)[N]) BOOST_NOEXCEPT)[N]
|
T (*addressof(T (&o)[N]) BOOST_NOEXCEPT)[N]
|
||||||
|
@@ -29,7 +29,7 @@
|
|||||||
# define BOOST_RETHROW throw;
|
# define BOOST_RETHROW throw;
|
||||||
# define BOOST_CATCH_END }
|
# define BOOST_CATCH_END }
|
||||||
#else
|
#else
|
||||||
# if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
|
# if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
|
||||||
# define BOOST_TRY { if ("")
|
# define BOOST_TRY { if ("")
|
||||||
# define BOOST_CATCH(x) else if (!"")
|
# define BOOST_CATCH(x) else if (!"")
|
||||||
# elif !defined(BOOST_MSVC) || BOOST_MSVC >= 1900
|
# elif !defined(BOOST_MSVC) || BOOST_MSVC >= 1900
|
||||||
|
@@ -116,7 +116,7 @@ private:
|
|||||||
/**
|
/**
|
||||||
@cond
|
@cond
|
||||||
*/
|
*/
|
||||||
#if defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT(0x581) )
|
#if defined( BOOST_BORLANDC ) && BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT(0x581) )
|
||||||
# define BOOST_REF_CONST
|
# define BOOST_REF_CONST
|
||||||
#else
|
#else
|
||||||
# define BOOST_REF_CONST const
|
# define BOOST_REF_CONST const
|
||||||
|
Reference in New Issue
Block a user