feedc0de/boost_core
1
0
Fork 0
forked from boostorg/core
Code Pull Requests Activity

Support g++4.7 with SFINAE workaround

Browse Source
This commit is contained in:
Glen Fernandes
2017-02-02 13:42:42 -05:00
parent b0a58a16e2
commit 9587d6b845
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/boost/core/addressof.hpp
View File

@@ -6,8 +6,8 @@ Copyright (C) 2002, 2008, 2013 Peter Dimov
Copyright (C) 2017 Glen Joseph Fernandes (glenjofe@gmail.com) Copyright (C) 2017 Glen Joseph Fernandes (glenjofe@gmail.com)
Distributed under the Boost Software License, Version 1.0. (See Distributed under the Boost Software License, Version 1.0.
accompanying file LICENSE_1_0.txt or copy at (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt) http://www.boost.org/LICENSE_1_0.txt)
*/ */
@@ -57,6 +57,7 @@ public:
return o_; return o_;
} }
private: private:
addressof_ref& operator=(const addressof_ref&);
T& o_; T& o_;
}; };
@@ -119,25 +120,22 @@ struct address_of<const volatile addressof_null_t> {
defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || \ defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || \
defined(BOOST_NO_CXX11_CONSTEXPR) || \ defined(BOOST_NO_CXX11_CONSTEXPR) || \
defined(BOOST_NO_CXX11_DECLTYPE) || \ defined(BOOST_NO_CXX11_DECLTYPE) || \
defined(BOOST_MSVC_FULL_VER) BOOST_WORKAROUND(BOOST_MSVC_FULL_VER, < 190024215)
#define BOOST_CORE_NO_CONSTEXPR_ADDRESSOF #define BOOST_CORE_NO_CONSTEXPR_ADDRESSOF
template<class T> template<class T>
BOOST_FORCEINLINE T* BOOST_FORCEINLINE T*
addressof(T& o) BOOST_NOEXCEPT addressof(T& o) BOOST_NOEXCEPT
{ {
#if (defined(__BORLANDC__) && \ #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) || \
BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610))) || \ BOOST_WORKAROUND(__SUNPRO_CC, <= 0x5120)
(defined(__SUNPRO_CC) && \
BOOST_WORKAROUND(__SUNPRO_CC, <= 0x5120))
return detail::address_of<T>::get(o, 0); return detail::address_of<T>::get(o, 0);
#else #else
return detail::address_of<T>::get(detail::addressof_ref<T>(o), 0); return detail::address_of<T>::get(detail::addressof_ref<T>(o), 0);
#endif #endif
} }
#if defined(__SUNPRO_CC) && \ #if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x590))
BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x590))
namespace detail { namespace detail {
template<class T> template<class T>
@@ -155,8 +153,7 @@ addressof(T (&o)[N]) BOOST_NOEXCEPT
} }
#endif #endif
#if defined(__BORLANDC__) && \ #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
BOOST_WORKAROUND(__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]
@@ -199,7 +196,9 @@ struct addressof_member_operator<T, typename
static constexpr bool value = true; static constexpr bool value = true;
}; };
#if defined(BOOST_INTEL) && BOOST_WORKAROUND(BOOST_INTEL, < 1600) #if BOOST_WORKAROUND(BOOST_INTEL, < 1600) || \
(defined(BOOST_GCC) && \
BOOST_WORKAROUND(BOOST_GCC, < 40800))
struct addressof_addressable { }; struct addressof_addressable { };
addressof_addressable* addressof_addressable*