Minor cleanup

microsoft · Oct 9, 2020 · d2b1d42 · d2b1d42
1 parent 503d11e
commit d2b1d42
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/stl/inc/algorithm b/stl/inc/algorithm
@@ -1852,16 +1852,15 @@ namespace ranges {
     _NODISCARD constexpr _It2 _Move_backward_common(const _It1 _First, _It1 _Last, _It2 _Result) {
         // clang-format on
         if constexpr (_Ptr_move_cat<_It1, _It2>::_Trivially_copyable) {
-#ifdef __cpp_lib_is_constant_evaluated
-            if (!_STD is_constant_evaluated())
-#endif // __cpp_lib_is_constant_evaluated
-            {
+            if (!_STD is_constant_evaluated()) {
                 return _Memmove_backward(_First, _Last, _Result);
             }
         }
+
         while (_First != _Last) {
             *--_Result = _RANGES iter_move(--_Last);
         }
+
         return _Result;
     }
 

diff --git a/stl/inc/vector b/stl/inc/vector
@@ -635,8 +635,7 @@ private:
                     _Clear_and_reserve_geometric(_Newsize);
                 }
 
-                _Mylast = _Refancy<pointer>(
-                    _Uninitialized_move_unchecked(_Unfancy(_First), _Unfancy(_Last), _Unfancy(_Myfirst)));
+                _Mylast = _Refancy<pointer>(_Memmove_forward(_Unfancy(_First), _Unfancy(_Last), _Unfancy(_Myfirst)));
             } else
 #endif // _HAS_IF_CONSTEXPR
             {
@@ -1110,7 +1109,7 @@ private:
                 _Clear_and_reserve_geometric(_Newsize);
             }
 
-            _Mylast = _Refancy<pointer>(_Uninitialized_copy_unchecked(_First, _Last, _Unfancy(_Myfirst)));
+            _Mylast = _Refancy<pointer>(_Memmove_forward(_First, _Last, _Unfancy(_Myfirst)));
         } else
 #endif // _HAS_IF_CONSTEXPR
         {