gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3916 from asmodai27:main

Browse Source 
PiperOrigin-RevId: 471062949
Change-Id: I3f063c441b3d4275d931016c431519c14e68d51c
This commit is contained in:
Copybara-Service
2022-08-30 12:40:01 -07:00
parent afd902e992 5eaa113903
commit 9080381758
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
googlemock/src/gmock-internal-utils.cc
View File

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

2
googletest/src/gtest-printers.cc
View File

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