summaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorTom Hughes <tomhughes@google.com>2023-01-12 17:03:40 (GMT)
committerCopybara-Service <copybara-worker@google.com>2023-01-12 17:04:13 (GMT)
commit356fc301251378e0f6fa6aa794d73714202887ac (patch)
treef109e63fe7b66acfe4d1077bba37fcff8710cd2a /googlemock
parentb5401fef68794d93b7fcd933bc3692211e8ebad1 (diff)
downloadgoogletest-356fc301251378e0f6fa6aa794d73714202887ac.zip
googletest-356fc301251378e0f6fa6aa794d73714202887ac.tar.gz
googletest-356fc301251378e0f6fa6aa794d73714202887ac.tar.bz2
Fix -Wshadow warnings
../googlemock/test/gmock-actions_test.cc:687:36: warning: declaration of ‘v’ shadows a member of ‘testing::{anonymous}::ReturnTest_SupportsReferenceLikeReturnType_Test::TestBody()::Result’ [-Wshadow] 687 | Result(const std::vector<int>& v) : v(&v) {} // NOLINT | ~~~~~~~~~~~~~~~~~~~~~~~~^ ../googlemock/test/gmock-actions_test.cc:686:29: note: shadowed declaration is here 686 | const std::vector<int>* v; | ^ ../googlemock/test/gmock-actions_test.cc: In constructor ‘testing::{anonymous}::ReturnTest_PrefersConversionOperator_Test::TestBody()::Out::Out(int)’: ../googlemock/test/gmock-actions_test.cc:720:28: warning: declaration of ‘x’ shadows a member of ‘testing::{anonymous}::ReturnTest_PrefersConversionOperator_Test::TestBody()::Out’ [-Wshadow] 720 | explicit Out(const int x) : x(x) {} | ~~~~~~~~~~^ ../googlemock/test/gmock-actions_test.cc:718:9: note: shadowed declaration is here 718 | int x; | ^ PiperOrigin-RevId: 501580618 Change-Id: I584710fbbe440ec724f88746e51f3be5653c32d5
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/test/gmock-actions_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc
index e5a7ae1..510d15c 100644
--- a/googlemock/test/gmock-actions_test.cc
+++ b/googlemock/test/gmock-actions_test.cc
@@ -684,7 +684,7 @@ TEST(ReturnTest, SupportsReferenceLikeReturnType) {
// A reference wrapper for std::vector<int>, implicitly convertible from it.
struct Result {
const std::vector<int>* v;
- Result(const std::vector<int>& v) : v(&v) {} // NOLINT
+ Result(const std::vector<int>& vec) : v(&vec) {} // NOLINT
};
// Set up an action for a mock function that returns the reference wrapper
@@ -717,7 +717,7 @@ TEST(ReturnTest, PrefersConversionOperator) {
struct Out {
int x;
- explicit Out(const int x) : x(x) {}
+ explicit Out(const int val) : x(val) {}
explicit Out(const In&) : x(0) {}
};