Merge pull request #3916 from asmodai27:main

PiperOrigin-RevId: 471062949
Change-Id: I3f063c441b3d4275d931016c431519c14e68d51c

googlemock/src/gmock-internal-utils.cc

@@ -200,8 +200,9 @@ GTEST_API_ void IllegalDoDefault(const char* file, int line) {
 
 constexpr char UnBase64Impl(char c, const char* const base64, char carry) {
   return *base64 == 0 ? static_cast<char>(65)
-         : *base64 == c ? carry
-                        : UnBase64Impl(c, base64 + 1, carry + 1);
+         : *base64 == c
+             ? carry
+             : UnBase64Impl(c, base64 + 1, static_cast<char>(carry + 1));
 }
 
 template <size_t... I>

googletest/src/gtest-printers.cc

@@ -315,7 +315,7 @@ void PrintTo(__uint128_t v, ::std::ostream* os) {
     low = low / 10 + high_mod * 1844674407370955161 + carry / 10;
 
     char digit = static_cast<char>(carry % 10);
-    *--p = '0' + digit;
+    *--p = static_cast<char>('0' + digit);
   }
   *os << p;
 }