Skip to content

Commit 85b0db2

Browse files
deps: update googletest to 0b1e895ba4226c2fda5ee0178c9b5b1195a741aa
PR-URL: #64039 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent 3d3c7ea commit 85b0db2

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

deps/googletest/include/gtest/internal/gtest-internal.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,12 @@
9696

9797
namespace proto2 {
9898
class [[nodiscard]] MessageLite;
99+
100+
// Dummy forward declaration of `DynamicCastMessage`. Does not match any actual
101+
// overloads of `DynamicCastMessage`, but can be used to assist name resolution
102+
// in templates.
103+
template <typename T>
104+
T DynamicCastMessage() = delete;
99105
}
100106

101107
namespace testing {

deps/googletest/src/gtest-printers.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@ void PrintBytesInObjectToImpl(const unsigned char* obj_bytes, size_t count,
114114
// char32_t.
115115
template <typename CharType>
116116
char32_t ToChar32(CharType in) {
117-
return static_cast<char32_t>(
118-
static_cast<typename std::make_unsigned<CharType>::type>(in));
117+
return static_cast<char32_t>(static_cast<std::make_unsigned_t<CharType>>(in));
119118
}
120119

121120
} // namespace

0 commit comments

Comments
 (0)