Merge e0a66700097df42f4daf920110c9bf8214cc89b3 into 9156d4caac880b513264ecbe0aa4746a3fead3d7

This commit is contained in:
Jeremy Nimmer 2025-12-16 10:23:36 -05:00 committed by GitHub
commit 35011f6539
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1345,13 +1345,13 @@ class [[nodiscard]] NeverThrown {
expected_exception>::type>::type, \
std::exception>::value, \
const ::testing::internal::NeverThrown&, const std::exception&>::type \
e) { \
gtest_caught_exception) { \
gtest_msg.value = "Expected: " #statement \
" throws an exception of type " #expected_exception \
".\n Actual: it throws "; \
gtest_msg.value += GTEST_EXCEPTION_TYPE_(e); \
gtest_msg.value += GTEST_EXCEPTION_TYPE_(gtest_caught_exception); \
gtest_msg.value += " with description \""; \
gtest_msg.value += e.what(); \
gtest_msg.value += gtest_caught_exception.what(); \
gtest_msg.value += "\"."; \
goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
}