diff options
| author | Scott Slack-Smith <deenderah@gmail.com> | 2017-11-24 16:00:56 +0000 |
|---|---|---|
| committer | Scott Slack-Smith <deenderah@gmail.com> | 2017-11-24 16:00:56 +0000 |
| commit | 6c093a2391eb66a42bd4146443265eddad06be0c (patch) | |
| tree | b61e233a023b5c5a43c31520fd6b84f5a4b37788 /googlemock/test/gmock-generated-actions_test.cc | |
| parent | c958e26fd02d43a916ff297c89eee22166fe7be7 (diff) | |
| parent | d175c8bf823e709d570772b038757fadf63bc632 (diff) | |
| download | googletest-6c093a2391eb66a42bd4146443265eddad06be0c.tar.gz googletest-6c093a2391eb66a42bd4146443265eddad06be0c.tar.bz2 googletest-6c093a2391eb66a42bd4146443265eddad06be0c.zip | |
Merge branch 'master' of https://github.com/google/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), |