diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:24:46 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:25:39 +0900 |
| commit | 4fadd968fa12130524c8380f33fcfe25d4de79e5 (patch) | |
| tree | fd26a490cd15388d42fc6652b3c5c13012e7f93e /boost/core/addressof.hpp | |
| parent | b5c87084afaef42b2d058f68091be31988a6a874 (diff) | |
| download | boost-upstream/1.65.0.tar.gz boost-upstream/1.65.0.tar.bz2 boost-upstream/1.65.0.zip | |
Imported Upstream version 1.65.0upstream/1.65.0
Change-Id: Icf8400b375482cb11bcf77440a6934ba360d6ba4
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/core/addressof.hpp')
| -rw-r--r-- | boost/core/addressof.hpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/boost/core/addressof.hpp b/boost/core/addressof.hpp index 0a2b46be77..8ddda8be4a 100644 --- a/boost/core/addressof.hpp +++ b/boost/core/addressof.hpp @@ -42,7 +42,7 @@ addressof(T& o) BOOST_NOEXCEPT } /* boost */ #else -#include <boost/detail/workaround.hpp> +#include <boost/config/workaround.hpp> #include <cstddef> namespace boost { @@ -117,7 +117,6 @@ struct address_of<const volatile addressof_null_t> { } /* detail */ #if defined(BOOST_NO_CXX11_SFINAE_EXPR) || \ - defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || \ defined(BOOST_NO_CXX11_CONSTEXPR) || \ defined(BOOST_NO_CXX11_DECLTYPE) #define BOOST_CORE_NO_CONSTEXPR_ADDRESSOF @@ -171,7 +170,7 @@ const T (*addressof(const T (&o)[N]) BOOST_NOEXCEPT)[N] namespace detail { template<class T> -T&& addressof_declval() BOOST_NOEXCEPT; +T addressof_declval() BOOST_NOEXCEPT; template<class> struct addressof_void { @@ -262,4 +261,14 @@ addressof(T& o) BOOST_NOEXCEPT } /* boost */ #endif +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && \ + !defined(BOOST_NO_CXX11_DELETED_FUNCTIONS) +namespace boost { + +template<class T> +const T* addressof(const T&&) = delete; + +} /* boost */ +#endif + #endif |