Fix inconsistencies

Author: miscco

stl/inc/vector

@@ -1137,6 +1137,7 @@ private:
                 }
 
                 _Mylast = _Refancy<pointer>(_Memmove_forward(_First, _Last, _Unfancy(_Myfirst)));
+                return;
             }
         }
 #endif // _HAS_IF_CONSTEXPR
@@ -1765,7 +1766,7 @@ private:
         _Xout_of_range("invalid vector subscript");
     }
 
-#if _ITERATOR_DEBUG_LEVEL != 0
+#if _ITERATOR_DEBUG_LEVEL == 2
 #ifdef __cpp_lib_is_constant_evaluated
     // orphan iterators within specified (inclusive) range
     _CONSTEXPR20_DYNALLOC void _Orphan_range_unlocked(pointer _First, pointer _Last) const {
@@ -1806,9 +1807,9 @@ private:
             _Orphan_range_locked(_First, _Last);
         }
     }
-#else // ^^^ _ITERATOR_DEBUG_LEVEL != 0 ^^^ // vvv _ITERATOR_DEBUG_LEVEL == 0 vvv
+#else // ^^^ _ITERATOR_DEBUG_LEVEL == 2 ^^^ // vvv _ITERATOR_DEBUG_LEVEL != 2 vvv
     _CONSTEXPR20_DYNALLOC void _Orphan_range(pointer, pointer) const {}
-#endif // _ITERATOR_DEBUG_LEVEL != 0
+#endif // _ITERATOR_DEBUG_LEVEL != 2
 
     _NODISCARD _CONSTEXPR20_DYNALLOC _Alty& _Getal() noexcept {
         return _Mypair._Get_first();

stl/inc/xmemory

@@ -1127,11 +1127,15 @@ public:
     _CONSTEXPR20_DYNALLOC _Container_base12& operator=(const _Container_base12&) = delete;
 
     _CONSTEXPR20_DYNALLOC void _Orphan_all() noexcept;
+#ifdef __cpp_lib_is_constant_evaluated
     _CONSTEXPR20_DYNALLOC void _Orphan_all_unlocked() noexcept;
+#endif // __cpp_lib_is_constant_evaluated
     inline void _Orphan_all_locked() noexcept;
 
     _CONSTEXPR20_DYNALLOC void _Swap_proxy_and_iterators(_Container_base12&) noexcept;
+#ifdef __cpp_lib_is_constant_evaluated
     _CONSTEXPR20_DYNALLOC void _Swap_proxy_and_iterators_unlocked(_Container_base12&) noexcept;
+#endif // __cpp_lib_is_constant_evaluated
     inline void _Swap_proxy_and_iterators_locked(_Container_base12&) noexcept;
 
     template <class _Alloc>
@@ -1186,6 +1190,7 @@ struct _Iterator_base12 { // store links to container proxy, next iterator
     }
 
 #if _ITERATOR_DEBUG_LEVEL == 2
+#ifdef __cpp_lib_is_constant_evaluated
     _CONSTEXPR20_DYNALLOC void _Adopt_unlocked(const _Container_base12* _Parent) noexcept {
         _Container_proxy* _Parent_proxy = _Parent->_Myproxy;
 
@@ -1196,6 +1201,7 @@ struct _Iterator_base12 { // store links to container proxy, next iterator
             _Myproxy                    = _Parent_proxy;
         }
     }
+#endif // __cpp_lib_is_constant_evaluated
 
     inline void _Adopt_locked(const _Container_base12* _Parent) noexcept {
         _Container_proxy* _Parent_proxy = _Parent->_Myproxy;
@@ -1242,6 +1248,7 @@ struct _Iterator_base12 { // store links to container proxy, next iterator
     }
 
 #if _ITERATOR_DEBUG_LEVEL == 2
+#ifdef __cpp_lib_is_constant_evaluated
     _CONSTEXPR20_DYNALLOC void _Orphan_me_unlocked() noexcept {
         if (_Myproxy) { // adopted, remove self from list
             _Iterator_base12** _Pnext = &_Myproxy->_Myfirstiter;
@@ -1254,6 +1261,7 @@ struct _Iterator_base12 { // store links to container proxy, next iterator
             _Myproxy = nullptr;
         }
     }
+#endif // __cpp_lib_is_constant_evaluated
 
     inline void _Orphan_me_locked() noexcept {
         _Lockit _Lock(_LOCK_DEBUG);
@@ -1288,13 +1296,15 @@ struct _Iterator_base12 { // store links to container proxy, next iterator
 };
 
 // MEMBER FUNCTIONS FOR _Container_base12
+#ifdef __cpp_lib_is_constant_evaluated
 _CONSTEXPR20_DYNALLOC void _Container_base12::_Orphan_all_unlocked() noexcept {
     for (auto _Pnext = &_Myproxy->_Myfirstiter; *_Pnext; *_Pnext = (*_Pnext)->_Mynextiter) {
         (*_Pnext)->_Myproxy = nullptr;
     }
 
     _Myproxy->_Myfirstiter = nullptr;
 }
+#endif // __cpp_lib_is_constant_evaluated
 
 inline void _Container_base12::_Orphan_all_locked() noexcept {
     _Lockit _Lock(_LOCK_DEBUG);
@@ -1318,6 +1328,7 @@ _CONSTEXPR20_DYNALLOC void _Container_base12::_Orphan_all() noexcept {
     }
 }
 
+#ifdef __cpp_lib_is_constant_evaluated
 _CONSTEXPR20_DYNALLOC void _Container_base12::_Swap_proxy_and_iterators_unlocked(_Container_base12& _Right) noexcept {
     _Container_proxy* _Temp = _Myproxy;
     _Myproxy                = _Right._Myproxy;
@@ -1331,6 +1342,7 @@ _CONSTEXPR20_DYNALLOC void _Container_base12::_Swap_proxy_and_iterators_unlocked
         _Right._Myproxy->_Mycont = &_Right;
     }
 }
+#endif // __cpp_lib_is_constant_evaluated
 
 inline void _Container_base12::_Swap_proxy_and_iterators_locked(_Container_base12& _Right) noexcept {
     _Lockit _Lock(_LOCK_DEBUG);