diff options
| author | Copybara-Service <copybara-worker@google.com> | 2022-08-30 19:40:01 (GMT) |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2022-08-30 19:40:01 (GMT) |
| commit | 9080381758fad853aa17ba1c3255ee8a35e452ca (patch) | |
| tree | 6251e3dead01c06ebdc6fef6538f5591cd0fd2ae | |
| parent | afd902e992b720d1b3e106bc5e425a5768872265 (diff) | |
| parent | 5eaa1139038076ed9bc029ab6518844a1b03ea7f (diff) | |
| download | googletest-9080381758fad853aa17ba1c3255ee8a35e452ca.zip googletest-9080381758fad853aa17ba1c3255ee8a35e452ca.tar.gz googletest-9080381758fad853aa17ba1c3255ee8a35e452ca.tar.bz2 | |
Merge pull request #3916 from asmodai27:main
PiperOrigin-RevId: 471062949
Change-Id: I3f063c441b3d4275d931016c431519c14e68d51c
| -rw-r--r-- | googlemock/src/gmock-internal-utils.cc | 7 | ||||
| -rw-r--r-- | googletest/src/gtest-printers.cc | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/googlemock/src/gmock-internal-utils.cc b/googlemock/src/gmock-internal-utils.cc index f7d740c..7bfff02 100644 --- a/googlemock/src/gmock-internal-utils.cc +++ b/googlemock/src/gmock-internal-utils.cc @@ -199,9 +199,10 @@ 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); + return *base64 == 0 ? static_cast<char>(65) + : *base64 == c + ? carry + : UnBase64Impl(c, base64 + 1, static_cast<char>(carry + 1)); } template <size_t... I> diff --git a/googletest/src/gtest-printers.cc b/googletest/src/gtest-printers.cc index f3976d2..d475ad3 100644 --- a/googletest/src/gtest-printers.cc +++ b/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; } |