diff options
Diffstat (limited to 'libcxx/include/__algorithm/stable_sort.h')
| -rw-r--r-- | libcxx/include/__algorithm/stable_sort.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libcxx/include/__algorithm/stable_sort.h b/libcxx/include/__algorithm/stable_sort.h index 32b239a0d72f..41e17bde99ef 100644 --- a/libcxx/include/__algorithm/stable_sort.h +++ b/libcxx/include/__algorithm/stable_sort.h @@ -23,9 +23,6 @@ #pragma GCC system_header #endif -_LIBCPP_PUSH_MACROS -#include <__undef_macros> - _LIBCPP_BEGIN_NAMESPACE_STD template <class _Compare, class _InputIterator1, class _InputIterator2> @@ -41,14 +38,14 @@ __merge_move_construct(_InputIterator1 __first1, _InputIterator1 __last1, { if (__first1 == __last1) { - for (; __first2 != __last2; ++__first2, ++__result, (void)__d.template __incr<value_type>()) + for (; __first2 != __last2; ++__first2, (void) ++__result, __d.template __incr<value_type>()) ::new ((void*)__result) value_type(_VSTD::move(*__first2)); __h.release(); return; } if (__first2 == __last2) { - for (; __first1 != __last1; ++__first1, ++__result, (void)__d.template __incr<value_type>()) + for (; __first1 != __last1; ++__first1, (void) ++__result, __d.template __incr<value_type>()) ::new ((void*)__result) value_type(_VSTD::move(*__first1)); __h.release(); return; @@ -230,6 +227,4 @@ stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last) _LIBCPP_END_NAMESPACE_STD -_LIBCPP_POP_MACROS - #endif // _LIBCPP___ALGORITHM_STABLE_SORT_H |