coffee/googletest
1
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-12-06 16:57:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid -Wshadow warnings in EXPECT_THROW

Browse Source 
Naming a local variable "e" in a macro body is asking for trouble.
This commit is contained in:
Jeremy Nimmer 2025-11-06 10:40:03 -08:00
parent 6ec14dfd8c
commit e0a6670009
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
googletest/include/gtest/internal/gtest-internal.h
View File

@ -1344,13 +1344,13 @@ class NeverThrown {
expected_exception>::type>::type, \ expected_exception>::type>::type, \
std::exception>::value, \ std::exception>::value, \
const ::testing::internal::NeverThrown&, const std::exception&>::type \ const ::testing::internal::NeverThrown&, const std::exception&>::type \
e) { \ gtest_caught_exception) { \
gtest_msg.value = "Expected: " #statement \ gtest_msg.value = "Expected: " #statement \
" throws an exception of type " #expected_exception \ " throws an exception of type " #expected_exception \
".\n Actual: it throws "; \ ".\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 += " with description \""; \
gtest_msg.value += e.what(); \ gtest_msg.value += gtest_caught_exception.what(); \
gtest_msg.value += "\"."; \ gtest_msg.value += "\"."; \
goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \ goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
} }