X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fboost%2Fboost%2Foptional%2Fdetail%2Fold_optional_implementation.hpp;h=3431e155a4a4d55f37a8e5cb3325ca65c92b768c;hb=20effc670b57271cb089376d6d0800990e5218d5;hp=f8dc260d52c2f00a3f9b203044b3cc3d73d05f37;hpb=a71831dadd1e1f3e0fa70405511f65cc33db0498;p=ceph.git diff --git a/ceph/src/boost/boost/optional/detail/old_optional_implementation.hpp b/ceph/src/boost/boost/optional/detail/old_optional_implementation.hpp index f8dc260d5..3431e155a 100644 --- a/ceph/src/boost/boost/optional/detail/old_optional_implementation.hpp +++ b/ceph/src/boost/boost/optional/detail/old_optional_implementation.hpp @@ -79,7 +79,7 @@ class optional_base : public optional_tag private : typedef -#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) +#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564)) BOOST_DEDUCED_TYPENAME #endif ::boost::detail::make_reference_content::type internal_type ; @@ -619,7 +619,7 @@ class optional_base : public optional_tag 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() ; } -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x581)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x581)) void destroy_impl ( is_not_reference_tag ) { get_ptr_impl()->internal_type::~internal_type() ; m_initialized = false ; } #else void destroy_impl ( is_not_reference_tag ) { get_ptr_impl()->~T() ; m_initialized = false ; }