Merge pull request #40 from mclow/cleanup.1

Minor cleanups

Author: cor3ntin

libcxx/include/__memory/uninitialized_algorithms.h

@@ -539,7 +539,7 @@ class _AllocatorDestroyRangeReverse {
   _Iter& __last_;
 };
 
-#if _LIBCPP_STD_VER >= 20
+#if _LIBCPP_STD_VER >= 26
 
 template <class _Tp>
 constexpr

libcxx/include/__utility/swap.h

@@ -62,7 +62,7 @@ void swap_value_representations(_Tp& __a, _Tp& __b) {
   // TODO: research better memswap algorithms
   char __buffer[__size];
   if constexpr (__chunk) {
-    for (std::size_t n = 0; n < __chunk; n++, __aptr += __size, __bptr += __size) {
+    for (std::size_t __n = 0; n < __chunk; __n++, __aptr += __size, __bptr += __size) {
       __builtin_memcpy(__buffer, __aptr, __size);
       __builtin_memmove(__aptr, __bptr, __size);
       __builtin_memmove(__bptr, __buffer, __size);

libcxx/include/vector

@@ -1576,7 +1576,7 @@ vector<_Tp, _Allocator>::erase(const_iterator __position) {
       __position != end(), "vector::erase(iterator) called with a non-dereferenceable iterator");
   difference_type __ps = __position - cbegin();
   pointer __p          = this->__begin_ + __ps;
-#if _LIBCPP_STD_VER >= 20
+#if _LIBCPP_STD_VER >= 26
   if constexpr (is_trivially_relocatable_v<_Tp> || is_nothrow_move_constructible_v<_Tp>) {
     size_type __old_size = size();
     // destroy the element at __p
@@ -1599,7 +1599,7 @@ vector<_Tp, _Allocator>::erase(const_iterator __first, const_iterator __last) {
   _LIBCPP_ASSERT_VALID_INPUT_RANGE(__first <= __last, "vector::erase(first, last) called with invalid range");
   pointer __p = this->__begin_ + (__first - begin());
   if (__first != __last) {
-#if _LIBCPP_STD_VER >= 20
+#if _LIBCPP_STD_VER >= 26
   if constexpr (is_trivially_relocatable_v<_Tp> || is_nothrow_move_constructible_v<_Tp>) {
     size_type __old_size = size();
     size_type __count = __last - __first;
@@ -1643,7 +1643,7 @@ vector<_Tp, _Allocator>::insert(const_iterator __position, const_reference __x)
     if (__p == this->__end_) {
       __construct_one_at_end(__x);
     } else {
-#if _LIBCPP_STD_VER >= 20
+#if _LIBCPP_STD_VER >= 26
       if constexpr (is_trivially_relocatable_v<_Tp> || is_nothrow_move_constructible_v<_Tp>) {
         // Make space by trivially relocating everything
         _ConstructTransaction __tx(*this, 1);
@@ -1683,7 +1683,7 @@ vector<_Tp, _Allocator>::insert(const_iterator __position, value_type&& __x) {
     if (__p == this->__end_) {
       __construct_one_at_end(std::move(__x));
     } else {
-#if _LIBCPP_STD_VER >= 20
+#if _LIBCPP_STD_VER >= 26
     if constexpr (is_trivially_relocatable_v<_Tp> || is_nothrow_move_constructible_v<_Tp>) {
       // Make space by trivially relocating everything
       _ConstructTransaction __tx(*this, 1);
@@ -1718,7 +1718,7 @@ vector<_Tp, _Allocator>::emplace(const_iterator __position, _Args&&... __args) {
     if (__p == this->__end_) {
       __construct_one_at_end(std::forward<_Args>(__args)...);
     } else {
-#if _LIBCPP_STD_VER >= 20
+#if _LIBCPP_STD_VER >= 26
     if constexpr (is_trivially_relocatable_v<_Tp> || is_nothrow_move_constructible_v<_Tp>) {
       // Make space by trivially relocating everything
       _ConstructTransaction __tx(*this, 1);