diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index f0218b792..2a2aa552a 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -1243,16 +1243,16 @@ TEST(InvokeWithoutArgsTest, Function) { TEST(InvokeWithoutArgsTest, Functor) { GTEST_DISABLE_DEPRECATED_PUSH_() // As an action that takes no argument. - Action a = InvokeWithoutArgs(NullaryFunctor()); // NOLINT + Action a = NullaryFunctor(); // NOLINT EXPECT_EQ(2, a.Perform(std::make_tuple())); // As an action that takes three arguments. Action a2 = // NOLINT - InvokeWithoutArgs(NullaryFunctor()); + NullaryFunctor(); EXPECT_EQ(2, a2.Perform(std::make_tuple(3, 3.5, 'a'))); // As an action that returns void. - Action a3 = InvokeWithoutArgs(VoidNullaryFunctor()); + Action a3 = VoidNullaryFunctor(); g_done = false; a3.Perform(std::make_tuple()); EXPECT_TRUE(g_done); diff --git a/googlemock/test/gmock_link_test.h b/googlemock/test/gmock_link_test.h index 6f749bb56..c33723e31 100644 --- a/googlemock/test/gmock_link_test.h +++ b/googlemock/test/gmock_link_test.h @@ -340,7 +340,7 @@ TEST(LinkTest, TestInvokeWithoutArgs) { GTEST_DISABLE_DEPRECATED_PUSH_() EXPECT_CALL(mock, VoidFromString(_)) - .WillOnce(InvokeWithoutArgs(&InvokeHelper::StaticVoidFromVoid)) + .WillOnce(&InvokeHelper::StaticVoidFromVoid) .WillOnce( InvokeWithoutArgs(&test_invoke_helper, &InvokeHelper::VoidFromVoid)); GTEST_DISABLE_DEPRECATED_POP_()