Skip to content

Fix CI after #138708 #140111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 15, 2025
Merged

Fix CI after #138708 #140111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19cf519
Fix CI after #138708
cor3ntin May 15, 2025
76aedfc
modify README.LLVM
cor3ntin May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions third-party/unittest/googletest/README.LLVM
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ Modified as follows:
* Added StringRef support to include/gtest/internal/custom/gtest-printers.h.
* Added LLVM printable value support to include/gtest/gtest-message.h and
include/gtest/gtest-printers.h.
* Modified `PrintTo(char16_t c, ::std::ostream* os)` and
`PrintTo(char16_t c, ::std::ostream* os)` in include/gtest/gtest-printers.h.
to work around https://github.com/google/googletest/issues/4762
8 changes: 6 additions & 2 deletions third-party/unittest/googletest/include/gtest/gtest-printers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,11 +510,15 @@ GTEST_API_ void PrintTo(wchar_t wc, ::std::ostream* os);

GTEST_API_ void PrintTo(char32_t c, ::std::ostream* os);
inline void PrintTo(char16_t c, ::std::ostream* os) {
PrintTo(ImplicitCast_<char32_t>(c), os);
// FIXME: the cast from char16_t to char32_t may be incorrect
// for a lone surrogate
PrintTo(static_cast<char32_t>(c), os);
Comment on lines +513 to +515
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Modifying third-party headers makes upgrading to newer versions much harder, are we sure we want to do that? What's the long-term plan?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

google/googletest#4762

}
#ifdef __cpp_lib_char8_t
inline void PrintTo(char8_t c, ::std::ostream* os) {
PrintTo(ImplicitCast_<char32_t>(c), os);
// FIXME: the cast from char8_t to char32_t may be incorrect
// for c > 0x7F
PrintTo(static_cast<char32_t>(c), os);
}
#endif

Expand Down
Loading