Rename base type again

This commit is contained in:
Glen Fernandes 2024-07-16 23:53:47 -04:00 committed by GitHub
parent 242b14bb69
commit 9e9e6e3898
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -96,8 +96,10 @@ private:
#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
#if defined(BOOST_MSVC) #if defined(BOOST_MSVC)
// This is a workaround to an MSVC bug when T is a nested class. /*
// See https://developercommunity.visualstudio.com/t/Compiler-bug:-Incorrect-C2247-and-C2248/10690025 This is a workaround to an MSVC bug when T is a nested class:
https://developercommunity.visualstudio.com/t/Compiler-bug:-Incorrect-C2247-and-C2248/10690025
*/
namespace detail { namespace detail {
template<class T> template<class T>
@ -138,10 +140,10 @@ template<class T, unsigned N>
class empty_value<T, N, true> class empty_value<T, N, true>
#if defined(BOOST_MSVC) #if defined(BOOST_MSVC)
: detail::empty_value_base<T> { : detail::empty_value_base<T> {
typedef detail::empty_value_base<T> base_type; typedef detail::empty_value_base<T> empty_base_;
#else #else
: T { : T {
typedef T base_type; typedef T empty_base_;
#endif #endif
public: public:
@ -154,26 +156,26 @@ public:
#endif #endif
BOOST_CONSTEXPR empty_value(boost::empty_init_t) BOOST_CONSTEXPR empty_value(boost::empty_init_t)
: base_type() { } : empty_base_() { }
#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template<class U, class... Args> template<class U, class... Args>
BOOST_CONSTEXPR empty_value(boost::empty_init_t, U&& value, Args&&... args) BOOST_CONSTEXPR empty_value(boost::empty_init_t, U&& value, Args&&... args)
: base_type(std::forward<U>(value), std::forward<Args>(args)...) { } : empty_base_(std::forward<U>(value), std::forward<Args>(args)...) { }
#else #else
template<class U> template<class U>
BOOST_CONSTEXPR empty_value(boost::empty_init_t, U&& value) BOOST_CONSTEXPR empty_value(boost::empty_init_t, U&& value)
: base_type(std::forward<U>(value)) { } : empty_base_(std::forward<U>(value)) { }
#endif #endif
#else #else
template<class U> template<class U>
BOOST_CONSTEXPR empty_value(boost::empty_init_t, const U& value) BOOST_CONSTEXPR empty_value(boost::empty_init_t, const U& value)
: base_type(value) { } : empty_base_(value) { }
template<class U> template<class U>
BOOST_CONSTEXPR empty_value(boost::empty_init_t, U& value) BOOST_CONSTEXPR empty_value(boost::empty_init_t, U& value)
: base_type(value) { } : empty_base_(value) { }
#endif #endif
BOOST_CONSTEXPR const T& get() const BOOST_NOEXCEPT { BOOST_CONSTEXPR const T& get() const BOOST_NOEXCEPT {