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

Avoid embedded preprocessor directives in __tree

Browse Source 
Similar to rL242623, move C++ version checks outside of _NOEXCEPT_()
macro invocation argument lists, to avoid "embedding a directive within
macro arguments has undefined behavior" warnings.

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


git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@279926 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dimitry Andric
2016-08-27 19:32:03 +00:00
parent 5db6737a36
commit 1421cf0f79
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/__tree
View File

@@ -1111,14 +1111,15 @@ public:
void clear() _NOEXCEPT; void clear() _NOEXCEPT;
void swap(__tree& __t) void swap(__tree& __t)
#if _LIBCPP_STD_VER <= 11
_NOEXCEPT_( _NOEXCEPT_(
__is_nothrow_swappable<value_compare>::value __is_nothrow_swappable<value_compare>::value
#if _LIBCPP_STD_VER <= 11
&& (!__node_traits::propagate_on_container_swap::value || && (!__node_traits::propagate_on_container_swap::value ||
__is_nothrow_swappable<__node_allocator>::value) __is_nothrow_swappable<__node_allocator>::value)
#endif
); );
#else
_NOEXCEPT_(__is_nothrow_swappable<value_compare>::value);
#endif
#ifndef _LIBCPP_CXX03_LANG #ifndef _LIBCPP_CXX03_LANG
template <class _Key, class ..._Args> template <class _Key, class ..._Args>
@@ -1797,13 +1798,15 @@ __tree<_Tp, _Compare, _Allocator>::destroy(__node_pointer __nd) _NOEXCEPT
template <class _Tp, class _Compare, class _Allocator> template <class _Tp, class _Compare, class _Allocator>
void void
__tree<_Tp, _Compare, _Allocator>::swap(__tree& __t) __tree<_Tp, _Compare, _Allocator>::swap(__tree& __t)
#if _LIBCPP_STD_VER <= 11
_NOEXCEPT_( _NOEXCEPT_(
__is_nothrow_swappable<value_compare>::value __is_nothrow_swappable<value_compare>::value
#if _LIBCPP_STD_VER <= 11
&& (!__node_traits::propagate_on_container_swap::value || && (!__node_traits::propagate_on_container_swap::value ||
__is_nothrow_swappable<__node_allocator>::value) __is_nothrow_swappable<__node_allocator>::value)
#endif
) )
#else
_NOEXCEPT_(__is_nothrow_swappable<value_compare>::value)
#endif
{ {
using _VSTD::swap; using _VSTD::swap;
swap(__begin_node_, __t.__begin_node_); swap(__begin_node_, __t.__begin_node_);