mirror of
https://github.com/boostorg/optional.git
synced 2025-07-30 20:47:18 +02:00
AlisdairM BCB2006 patch reapplied to HEAD
[SVN r32820]
This commit is contained in:
@ -66,7 +66,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT) \
|
#if !defined(BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT) \
|
||||||
&& BOOST_WORKAROUND(__BORLANDC__, <= 0x564)
|
&& BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x581) )
|
||||||
// BCB (up to 5.64) has the following bug:
|
// BCB (up to 5.64) has the following bug:
|
||||||
// If there is a member function/operator template of the form
|
// If there is a member function/operator template of the form
|
||||||
// template<class Expr> mfunc( Expr expr ) ;
|
// template<class Expr> mfunc( Expr expr ) ;
|
||||||
@ -401,7 +401,7 @@ class optional_base : public optional_tag
|
|||||||
reference_const_type dereference( internal_type const* p, is_reference_tag ) const { return p->get() ; }
|
reference_const_type dereference( internal_type const* p, is_reference_tag ) const { return p->get() ; }
|
||||||
reference_type dereference( internal_type* p, is_reference_tag ) { return p->get() ; }
|
reference_type dereference( internal_type* p, is_reference_tag ) { return p->get() ; }
|
||||||
|
|
||||||
#if BOOST_WORKAROUND(__BORLANDC__, <= 0x564)
|
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x581))
|
||||||
void destroy_impl ( is_not_reference_tag ) { get_ptr_impl()->internal_type::~internal_type() ; m_initialized = false ; }
|
void destroy_impl ( is_not_reference_tag ) { get_ptr_impl()->internal_type::~internal_type() ; m_initialized = false ; }
|
||||||
#else
|
#else
|
||||||
void destroy_impl ( is_not_reference_tag ) { get_ptr_impl()->T::~T() ; m_initialized = false ; }
|
void destroy_impl ( is_not_reference_tag ) { get_ptr_impl()->T::~T() ; m_initialized = false ; }
|
||||||
|
Reference in New Issue
Block a user