LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add _LIBCPP_INLINE_VISIBILITY to __compressed_pair_elem members

Browse Source 
The commit r300140 changed the implementation of compressed_pair, but didn't add
_LIBCPP_INLINE_VISIBILITY to the constructors and get members of the
compressed_pair_elem class. This patch adds the visibility annotation.

I didn't find a way to test this change with libc++ regression tests.

rdar://35352579

Differential Revision: https://reviews.llvm.org/D39751


git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@317816 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Alex Lorenz
2017-11-09 17:54:49 +00:00
parent eada02443a
commit b4a34c08ac
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/memory
View File

@@ -2040,11 +2040,12 @@ struct __compressed_pair_elem {
typedef const _Tp& const_reference; typedef const _Tp& const_reference;
#ifndef _LIBCPP_CXX03_LANG #ifndef _LIBCPP_CXX03_LANG
constexpr __compressed_pair_elem() : __value_() {} _LIBCPP_INLINE_VISIBILITY constexpr __compressed_pair_elem() : __value_() {}
template <class _Up, class = typename enable_if< template <class _Up, class = typename enable_if<
!is_same<__compressed_pair_elem, typename decay<_Up>::type>::value !is_same<__compressed_pair_elem, typename decay<_Up>::type>::value
>::type> >::type>
_LIBCPP_INLINE_VISIBILITY
constexpr explicit constexpr explicit
__compressed_pair_elem(_Up&& __u) __compressed_pair_elem(_Up&& __u)
: __value_(_VSTD::forward<_Up>(__u)){}; : __value_(_VSTD::forward<_Up>(__u)){};
@@ -2055,11 +2056,13 @@ struct __compressed_pair_elem {
__tuple_indices<_Indexes...>) __tuple_indices<_Indexes...>)
: __value_(_VSTD::forward<_Args>(_VSTD::get<_Indexes>(__args))...) {} : __value_(_VSTD::forward<_Args>(_VSTD::get<_Indexes>(__args))...) {}
#else #else
__compressed_pair_elem() : __value_() {} _LIBCPP_INLINE_VISIBILITY __compressed_pair_elem() : __value_() {}
_LIBCPP_INLINE_VISIBILITY
__compressed_pair_elem(_ParamT __p) : __value_(std::forward<_ParamT>(__p)) {} __compressed_pair_elem(_ParamT __p) : __value_(std::forward<_ParamT>(__p)) {}
#endif #endif
reference __get() _NOEXCEPT { return __value_; } _LIBCPP_INLINE_VISIBILITY reference __get() _NOEXCEPT { return __value_; }
_LIBCPP_INLINE_VISIBILITY
const_reference __get() const _NOEXCEPT { return __value_; } const_reference __get() const _NOEXCEPT { return __value_; }
private: private:
@@ -2074,11 +2077,12 @@ struct __compressed_pair_elem<_Tp, _Idx, true> : private _Tp {
typedef _Tp __value_type; typedef _Tp __value_type;
#ifndef _LIBCPP_CXX03_LANG #ifndef _LIBCPP_CXX03_LANG
constexpr __compressed_pair_elem() = default; _LIBCPP_INLINE_VISIBILITY constexpr __compressed_pair_elem() = default;
template <class _Up, class = typename enable_if< template <class _Up, class = typename enable_if<
!is_same<__compressed_pair_elem, typename decay<_Up>::type>::value !is_same<__compressed_pair_elem, typename decay<_Up>::type>::value
>::type> >::type>
_LIBCPP_INLINE_VISIBILITY
constexpr explicit constexpr explicit
__compressed_pair_elem(_Up&& __u) __compressed_pair_elem(_Up&& __u)
: __value_type(_VSTD::forward<_Up>(__u)){}; : __value_type(_VSTD::forward<_Up>(__u)){};
@@ -2089,12 +2093,14 @@ struct __compressed_pair_elem<_Tp, _Idx, true> : private _Tp {
__tuple_indices<_Indexes...>) __tuple_indices<_Indexes...>)
: __value_type(_VSTD::forward<_Args>(_VSTD::get<_Indexes>(__args))...) {} : __value_type(_VSTD::forward<_Args>(_VSTD::get<_Indexes>(__args))...) {}
#else #else
__compressed_pair_elem() : __value_type() {} _LIBCPP_INLINE_VISIBILITY __compressed_pair_elem() : __value_type() {}
_LIBCPP_INLINE_VISIBILITY
__compressed_pair_elem(_ParamT __p) __compressed_pair_elem(_ParamT __p)
: __value_type(std::forward<_ParamT>(__p)) {} : __value_type(std::forward<_ParamT>(__p)) {}
#endif #endif
reference __get() _NOEXCEPT { return *this; } _LIBCPP_INLINE_VISIBILITY reference __get() _NOEXCEPT { return *this; }
_LIBCPP_INLINE_VISIBILITY
const_reference __get() const _NOEXCEPT { return *this; } const_reference __get() const _NOEXCEPT { return *this; }
}; };