diff options
| author | Henry Schreiner <henryschreineriii@utexas.edu> | 2018-04-06 21:52:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-06 21:52:42 +0200 |
| commit | 4b6a7a49ab63f609630ce58c18a39c4048ab3ad5 (patch) | |
| tree | 94c682c872a8879cfe3a8a1abbb7f42395ca79a4 /googlemock/test/gmock-actions_test.cc | |
| parent | b22e8dec408935a7f76420026a738eeb61f8af38 (diff) | |
| parent | 82febb8eafc0425601b0d46567dc66c7750233ff (diff) | |
| download | googletest-4b6a7a49ab63f609630ce58c18a39c4048ab3ad5.tar.gz googletest-4b6a7a49ab63f609630ce58c18a39c4048ab3ad5.tar.bz2 googletest-4b6a7a49ab63f609630ce58c18a39c4048ab3ad5.zip | |
Merge branch 'master' into cleanup-cmake
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: |