diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-08-14 15:29:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-14 15:29:51 -0700 |
| commit | 08b1a1f73cec48481ec3e477e8c247e7aa534df5 (patch) | |
| tree | 7d9b6428b2661baf08c8e50bbd9fa2eac6b54816 /googlemock/test/gmock-generated-actions_test.cc | |
| parent | 3f3a3ada2022a8b4255b408ef5d2ab439e987c08 (diff) | |
| parent | e0fc65c5fbfe4e50a0369d032e9b2811b4b7db77 (diff) | |
| download | googletest-08b1a1f73cec48481ec3e477e8c247e7aa534df5.tar.gz googletest-08b1a1f73cec48481ec3e477e8c247e7aa534df5.tar.bz2 googletest-08b1a1f73cec48481ec3e477e8c247e7aa534df5.zip | |
Merge branch 'master' into master
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), |