Fix some C++ warnings

stl/inc/xcharconv_ryu.h

@@ -703,7 +703,7 @@ _NODISCARD pair<_CharT*, errc> __d2fixed_buffered_n(_CharT* _First, _CharT* cons
 
 _NODISCARD inline to_chars_result __d2exp_buffered_n(char* _First, char* const _Last, const double __d,
   uint32_t __precision) {
-  char* const _Original_first = _First;
+    const char* const _Original_first = _First;
 
   const uint64_t __bits = __double_to_bits(__d);
 
@@ -1832,11 +1832,11 @@ _NODISCARD inline __floating_decimal_64 __d2d(const uint64_t __ieeeMantissa, con
 
   // Step 4: Find the shortest decimal representation in the interval of valid representations.
   int32_t __removed = 0;
-  uint8_t __lastRemovedDigit = 0;
   uint64_t _Output;
   // On average, we remove ~2 digits.
   if (__vmIsTrailingZeros || __vrIsTrailingZeros) {
-    // General case, which happens rarely (~0.7%).
+      uint8_t __lastRemovedDigit = 0;
+      // General case, which happens rarely (~0.7%).
     for (;;) {
       const uint64_t __vpDiv10 = __div10(__vp);
       const uint64_t __vmDiv10 = __div10(__vm);
@@ -2331,8 +2331,7 @@ _NODISCARD pair<_CharT*, errc> __d2s_buffered_n(_CharT* const _First, _CharT* co
   }
 
   __floating_decimal_64 __v;
-  const bool __isSmallInt = __d2d_small_int(__ieeeMantissa, __ieeeExponent, &__v);
-  if (__isSmallInt) {
+  if (const bool __isSmallInt = __d2d_small_int(__ieeeMantissa, __ieeeExponent, &__v)) {
     // For small integers in the range [1, 2^53), __v.__mantissa might contain trailing (decimal) zeros.
     // For scientific notation we need to move these zeros into the exponent.
     // (This is not needed for fixed-point notation, so it might be beneficial to trim

stl/inc/xlocnum

@@ -1241,7 +1241,7 @@ protected:
         _OutIt _Dest, ios_base& _Iosbase, _Elem _Fill, bool _Val) const { // put formatted bool to _Dest
         if (!(_Iosbase.flags() & ios_base::boolalpha)) {
             return do_put(_Dest, _Iosbase, _Fill, static_cast<long>(_Val));
-        } else { // put "false" or "true"
+        } else { // put "true" or "false"
             const auto& _Punct_fac = _STD use_facet<numpunct<_Elem>>(_Iosbase.getloc());
             basic_string<_Elem> _Str;
             if (_Val) {

stl/inc/xpolymorphic_allocator.h

@@ -149,9 +149,9 @@ namespace pmr {
         }
 
     private:
-        virtual void* do_allocate(size_t _Bytes, size_t _Align)               = 0;
-        virtual void do_deallocate(void* _Ptr, size_t _Bytes, size_t _Align)  = 0;
-        virtual bool do_is_equal(const memory_resource& _That) const noexcept = 0;
+        virtual void* do_allocate(size_t _Bytes, size_t _Align)                          = 0;
+        virtual void do_deallocate(void* _Ptr, size_t _Bytes, size_t _Align)             = 0;
+        _NODISCARD virtual bool do_is_equal(const memory_resource& _That) const noexcept = 0;
     };
 
     _NODISCARD inline bool operator==(const memory_resource& _Left, const memory_resource& _Right) noexcept {
@@ -269,7 +269,8 @@ namespace pmr {
         }
 
         template <class _Uty>
-        _CXX17_DEPRECATE_POLYMORPHIC_ALLOCATOR_DESTROY void destroy(_Uty* const _Ptr) noexcept /* strengthened */ {
+        _CXX17_DEPRECATE_POLYMORPHIC_ALLOCATOR_DESTROY void destroy(_Uty* const _Ptr) noexcept
+        /* strengthened */ {
             _Destroy_in_place(*_Ptr);
         }
 

stl/src/_tolower.cpp

@@ -84,7 +84,7 @@ _CRTIMP2_PURE int __CLRCALL_PURE_OR_CDECL _Tolower(int c, const _Ctypevec* ploc)
 
     // convert wide char to lowercase
     size = __crtLCMapStringA(locale_name, LCMAP_LOWERCASE, reinterpret_cast<const char*>(inbuffer), size,
-        reinterpret_cast<char*>(outbuffer), 3, codepage, TRUE);
+        reinterpret_cast<char*>(outbuffer), 3, static_cast<int>(codepage), TRUE);
 
     if (size == 0) {
         return c;

stl/src/_toupper.cpp

@@ -83,7 +83,7 @@ _CRTIMP2_PURE int __CLRCALL_PURE_OR_CDECL _Toupper(int c, const _Ctypevec* ploc)
 
     // convert wide char to uppercase
     size = __crtLCMapStringA(locale_name, LCMAP_UPPERCASE, reinterpret_cast<const char*>(inbuffer), size,
-        reinterpret_cast<char*>(outbuffer), 3, codepage, TRUE);
+        reinterpret_cast<char*>(outbuffer), 3, static_cast<int>(codepage), TRUE);
 
     if (size == 0) {
         return c;

stl/src/cond.cpp

@@ -12,8 +12,9 @@
 #include "primitives.hpp"
 
 struct _Cnd_internal_imp_t { // condition variable implementation for ConcRT
-    typename std::_Aligned_storage<Concurrency::details::stl_condition_variable_max_size,
-        Concurrency::details::stl_condition_variable_max_alignment>::type cv;
+    std::_Aligned_storage_t<Concurrency::details::stl_condition_variable_max_size,
+        Concurrency::details::stl_condition_variable_max_alignment>
+        cv;
 
     [[nodiscard]] Concurrency::details::stl_condition_variable_interface* _get_cv() noexcept {
         // get pointer to implementation

stl/src/cthread.cpp

@@ -85,6 +85,7 @@ void _Thrd_yield() { // surrender remainder of timeslice
     SwitchToThread();
 }
 
+extern "C" {
 // TRANSITION, ABI: _Thrd_equal() is preserved for binary compatibility
 _CRTIMP2_PURE int _Thrd_equal(_Thrd_t thr0, _Thrd_t thr1) { // return 1 if thr0 and thr1 identify same thread
     return thr0._Id == thr1._Id;
@@ -97,6 +98,7 @@ _CRTIMP2_PURE _Thrd_t _Thrd_current() { // return _Thrd_t identifying current th
     result._Id  = GetCurrentThreadId();
     return result;
 }
+}
 
 _Thrd_id_t _Thrd_id() { // return unique id for current thread
     return GetCurrentThreadId();

stl/src/iosptrs.cpp

@@ -42,9 +42,8 @@ _MRTIMP2 void __cdecl _Atexit(void(__cdecl* pf)()) { // add to wrapup list
 struct _Init_atexit { // controller for atexit processing
     __CLR_OR_THIS_CALL ~_Init_atexit() noexcept { // process wrapup functions
         while (atcount_cdecl < _Nats) {
-            const auto pf = reinterpret_cast<void(__cdecl*)()>(
-                DecodePointer(reinterpret_cast<void*>(atfuns_cdecl[atcount_cdecl++])));
-            if (pf) {
+            if (const auto pf = reinterpret_cast<void(__cdecl*)()>(
+                    DecodePointer(reinterpret_cast<void*>(atfuns_cdecl[atcount_cdecl++])))) {
                 pf();
             }
         }

stl/src/locale.cpp

@@ -107,15 +107,15 @@ void __CLRCALL_PURE_OR_CDECL locale::_Locimp::_Locimp_ctor(
 void __CLRCALL_PURE_OR_CDECL locale::_Locimp::_Locimp_Addfac(
     _Locimp* _This, locale::facet* ptrfac, size_t id) { // add a facet to a locale
     _BEGIN_LOCK(_LOCK_LOCALE)
-    const size_t MINCAT = 40; // minimum number of facets in a locale
+    constexpr size_t MINCAT = 40; // minimum number of facets in a locale
 
     if (_This->_Facetcount <= id) { // make facet vector larger
         size_t count = id + 1;
         if (count < MINCAT) {
             count = MINCAT;
         }
 
-        locale::facet** ptrnewvec =
+        const auto ptrnewvec =
             static_cast<locale::facet**>(_realloc_crt(_This->_Facetvec, count * sizeof(locale::facet**)));
         if (ptrnewvec == nullptr) { // report no memory
             _Xbad_alloc();

stl/src/locale0.cpp

@@ -146,7 +146,7 @@ _MRTIMP2_PURE locale __CLRCALL_PURE_OR_CDECL locale::empty() { // make empty tra
 }
 
 _MRTIMP2_PURE locale::_Locimp* __CLRCALL_PURE_OR_CDECL locale::_Init(bool _Do_incref) { // setup global and "C" locales
-    locale::_Locimp* ptr = nullptr;
+    locale::_Locimp* ptr;
 
     _BEGIN_LOCK(_LOCK_LOCALE) // prevent double initialization
 

stl/src/multprec.cpp

@@ -52,8 +52,8 @@ static void mul(
 
 void __CLRCALL_PURE_OR_CDECL _MP_Mul(
     _MP_arr w, unsigned long long u0, unsigned long long v0) noexcept { // multiply multi-word value by multi-word value
-    constexpr int m = 2;
-    constexpr int n = 2;
+    constexpr unsigned int m = 2;
+    constexpr unsigned int n = 2;
     unsigned long long u[2];
     unsigned long long v[2];
     u[0] = u0 & mask;
@@ -63,16 +63,16 @@ void __CLRCALL_PURE_OR_CDECL _MP_Mul(
 
     // Knuth, vol. 2, p. 268, Algorithm M
     // M1: [Initialize.]
-    for (int i = 0; i < m + n + 1; ++i) {
+    for (unsigned int i = 0; i < m + n + 1; ++i) {
         w[i] = 0;
     }
 
-    for (int j = 0; j < n; ++j) { // M2: [Zero multiplier?]
+    for (unsigned int j = 0; j < n; ++j) { // M2: [Zero multiplier?]
         if (v[j] == 0) {
             w[j + m] = 0;
         } else { // multiply by non-zero value
             unsigned long long k = 0;
-            int i;
+            unsigned int i;
             // M3: [Initialize i.]
             for (i = 0; i < m; ++i) { // M4: [Multiply and add.]
                 w[i + j] = u[i] * v[j] + w[i + j] + k;
@@ -170,7 +170,6 @@ void __CLRCALL_PURE_OR_CDECL _MP_Rem(
         }
         // D5: [Test remainder.]
         if (k != 0) { // D6: [Add back.]
-            --qh;
             add(u + j, n + 1, v, n);
         }
         // D7: [Loop on j.]

stl/src/mutex.cpp

@@ -38,8 +38,9 @@ extern "C" _CRTIMP2 void __cdecl __set_stl_sync_api_mode(__stl_sync_api_modes_en
 
 struct _Mtx_internal_imp_t { // ConcRT mutex
     int type;
-    typename std::_Aligned_storage<Concurrency::details::stl_critical_section_max_size,
-        Concurrency::details::stl_critical_section_max_alignment>::type cs;
+    std::_Aligned_storage_t<Concurrency::details::stl_critical_section_max_size,
+        Concurrency::details::stl_critical_section_max_alignment>
+        cs;
     long thread_id;
     int count;
     Concurrency::details::stl_critical_section_interface* _get_cs() { // get pointer to implementation

stl/src/nothrow.cpp

@@ -14,5 +14,5 @@
 #include <new>
 _STD_BEGIN
 
-const nothrow_t nothrow = nothrow_t(); // define nothrow
+constexpr nothrow_t nothrow = nothrow_t(); // define nothrow
 _STD_END

stl/src/pplerror.cpp

@@ -46,12 +46,10 @@ namespace Concurrency {
 
 #else // defined(_CRT_APP) || defined(UNDOCKED_WINDOWS_UCRT)
 
-namespace Concurrency {
-    namespace details {
+namespace Concurrency::details {
 
-        _CRTIMP2 void __thiscall _ExceptionHolder::ReportUnhandledError() {}
+    _CRTIMP2 void __thiscall _ExceptionHolder::ReportUnhandledError() {}
 
-    } // namespace details
-} // namespace Concurrency
+} // namespace Concurrency::details
 
 #endif // defined(_CRT_APP) || defined(UNDOCKED_WINDOWS_UCRT)