diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h index 445a3ed85..e861817f4 100644 --- a/googlemock/include/gmock/gmock-spec-builders.h +++ b/googlemock/include/gmock/gmock-spec-builders.h @@ -1292,10 +1292,10 @@ class MockSpec { : function_mocker_(function_mocker), matchers_(matchers) {} // Adds a new default action spec to the function mocker and returns - // the newly created spec. - internal::OnCallSpec& InternalDefaultActionSetAt(const char* file, - int line, const char* obj, - const char* call) { + // the newly created spec. .WillByDefault() must be called on the returned + // object. + [[nodiscard]] internal::OnCallSpec& InternalDefaultActionSetAt( + const char* file, int line, const char* obj, const char* call) { LogWithLocation(internal::kInfo, file, line, std::string("ON_CALL(") + obj + ", " + call + ") invoked"); return function_mocker_->AddNewOnCallSpec(file, line, matchers_); diff --git a/googlemock/test/gmock-internal-utils_test.cc b/googlemock/test/gmock-internal-utils_test.cc index 6c769a882..7cffd18a3 100644 --- a/googlemock/test/gmock-internal-utils_test.cc +++ b/googlemock/test/gmock-internal-utils_test.cc @@ -545,7 +545,7 @@ TEST(ExpectCallTest, DoesNotLogWhenVerbosityIsError) { void OnCallLogger() { DummyMock mock; - ON_CALL(mock, TestMethod()); + (void)ON_CALL(mock, TestMethod()); } // Verifies that ON_CALL logs if the --gmock_verbose flag is set to "info". @@ -568,7 +568,7 @@ TEST(OnCallTest, DoesNotLogWhenVerbosityIsError) { void OnCallAnyArgumentLogger() { DummyMock mock; - ON_CALL(mock, TestMethodArg(_)); + (void)ON_CALL(mock, TestMethodArg(_)); } // Verifies that ON_CALL prints provided _ argument. diff --git a/googlemock/test/gmock-spec-builders_test.cc b/googlemock/test/gmock-spec-builders_test.cc index 90f00c22a..287b249dc 100644 --- a/googlemock/test/gmock-spec-builders_test.cc +++ b/googlemock/test/gmock-spec-builders_test.cc @@ -160,7 +160,7 @@ class MockCC : public CC { // Tests that a method with expanded name compiles. TEST(OnCallSyntaxTest, CompilesWithMethodNameExpandedFromMacro) { MockCC cc; - ON_CALL(cc, Method()); + (void)ON_CALL(cc, Method()); } // Tests that the method with expanded name not only compiles but runs @@ -193,7 +193,7 @@ TEST(OnCallSyntaxTest, EvaluatesFirstArgumentOnce) { MockA a; MockA* pa = &a; - ON_CALL(*pa++, DoA(_)); + (void)ON_CALL(*pa++, DoA(_)); EXPECT_EQ(&a + 1, pa); } @@ -201,7 +201,7 @@ TEST(OnCallSyntaxTest, EvaluatesSecondArgumentOnce) { MockA a; int n = 0; - ON_CALL(a, DoA(n++)); + (void)ON_CALL(a, DoA(n++)); EXPECT_EQ(1, n); } @@ -232,7 +232,7 @@ TEST(OnCallSyntaxTest, WillByDefaultIsMandatory) { EXPECT_DEATH_IF_SUPPORTED( { - ON_CALL(a, DoA(5)); + (void)ON_CALL(a, DoA(5)); a.DoA(5); }, "");