diff options
| author | drgler <daniel.kruegler@gmail.com> | 2017-08-22 20:19:13 +0200 |
|---|---|---|
| committer | drgler <daniel.kruegler@gmail.com> | 2017-08-22 21:13:32 +0200 |
| commit | d93ce9d6fb8ea690239c69be6cbc58099a55ec13 (patch) | |
| tree | 65575eed9d0e5e39686efe40d530c45c00851b9d /googlemock/test/gmock-generated-actions_test.cc | |
| parent | 6404d45a92528cb0a8f8294d4c0b057c23138de5 (diff) | |
| parent | 8304d06199bdfb13bfb7613db9b5231141300e25 (diff) | |
| download | googletest-d93ce9d6fb8ea690239c69be6cbc58099a55ec13.tar.gz googletest-d93ce9d6fb8ea690239c69be6cbc58099a55ec13.tar.bz2 googletest-d93ce9d6fb8ea690239c69be6cbc58099a55ec13.zip | |
Merge branch 'master' of github.com:Dani-Hub/googletest
Diffstat (limited to 'googlemock/test/gmock-generated-actions_test.cc')
| -rw-r--r-- | googlemock/test/gmock-generated-actions_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/test/gmock-generated-actions_test.cc b/googlemock/test/gmock-generated-actions_test.cc index 58d45728..80bcb31c 100644 --- a/googlemock/test/gmock-generated-actions_test.cc +++ b/googlemock/test/gmock-generated-actions_test.cc @@ -1120,7 +1120,7 @@ TEST(ActionTemplateTest, WorksForIntegralTemplateParams) { EXPECT_FALSE(b); // Verifies that resetter is deleted. } -// Tests that ACTION_TEMPLATES works for template template parameters. +// Tests that ACTION_TEMPLATE works for a template with template parameters. ACTION_TEMPLATE(ReturnSmartPointer, HAS_1_TEMPLATE_PARAMS(template <typename Pointee> class, Pointer), |