From e0a66700097df42f4daf920110c9bf8214cc89b3 Mon Sep 17 00:00:00 2001 From: Jeremy Nimmer Date: Thu, 6 Nov 2025 10:40:03 -0800 Subject: [PATCH] Avoid -Wshadow warnings in EXPECT_THROW Naming a local variable "e" in a macro body is asking for trouble. --- googletest/include/gtest/internal/gtest-internal.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h index 808d89be9..f96d8be30 100644 --- a/googletest/include/gtest/internal/gtest-internal.h +++ b/googletest/include/gtest/internal/gtest-internal.h @@ -1344,13 +1344,13 @@ class 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__); \ }