diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2017-08-21 01:13:32 +0100 |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2017-08-21 01:13:32 +0100 |
| commit | a838de3348add7530431e8d91c8a66cc646f1888 (patch) | |
| tree | b5f3fa6d8e3c0da9cc6a0f1b9a85cd81b4a75e84 /googlemock/test/gmock-generated-actions_test.cc | |
| parent | e49429051272141a91ce898caa176f4366c5209e (diff) | |
| parent | 780bae0facea90a5b2105cbc09e87d99887c2e23 (diff) | |
| download | googletest-a838de3348add7530431e8d91c8a66cc646f1888.tar.gz googletest-a838de3348add7530431e8d91c8a66cc646f1888.tar.bz2 googletest-a838de3348add7530431e8d91c8a66cc646f1888.zip | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
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), |