diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-05 16:20:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-05 16:20:18 -0400 |
| commit | 82febb8eafc0425601b0d46567dc66c7750233ff (patch) | |
| tree | 8ba4de15422544aa4995d4dc269c61167866b00e /googlemock/test/gmock-actions_test.cc | |
| parent | d0905653ed34e3ded601d38237be2eb1870e759f (diff) | |
| parent | bee1d13fcc71b1c0d557fd71498015408ba506f8 (diff) | |
| download | googletest-82febb8eafc0425601b0d46567dc66c7750233ff.tar.gz googletest-82febb8eafc0425601b0d46567dc66c7750233ff.tar.bz2 googletest-82febb8eafc0425601b0d46567dc66c7750233ff.zip | |
Merge pull request #1549 from gennadiycivil/master
Merging gMock, 2
Diffstat (limited to 'googlemock/test/gmock-actions_test.cc')
| -rw-r--r-- | googlemock/test/gmock-actions_test.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index 01286634..46011570 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -704,6 +704,7 @@ class MockClass { MOCK_METHOD0(MakeUnique, std::unique_ptr<int>()); MOCK_METHOD0(MakeUniqueBase, std::unique_ptr<Base>()); MOCK_METHOD0(MakeVectorUnique, std::vector<std::unique_ptr<int>>()); + MOCK_METHOD1(TakeUnique, int(std::unique_ptr<int>)); #endif private: |