diff options
| author | Che-Hsun Liu <chehsunliu@gmail.com> | 2017-08-14 14:51:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-14 14:51:49 +0800 |
| commit | 24696c3958f0be6a87b52f07436417c53d0fef24 (patch) | |
| tree | 4993eb36b3296281b188b5adf662951c910c7fb2 /googlemock/test/gmock-generated-actions_test.cc | |
| parent | 509f7fe84094dc632ba1794c1f9bd3a7c049d5fe (diff) | |
| parent | 673c975a963f356b19fea90cb57b69192253da2a (diff) | |
| download | googletest-24696c3958f0be6a87b52f07436417c53d0fef24.tar.gz googletest-24696c3958f0be6a87b52f07436417c53d0fef24.tar.bz2 googletest-24696c3958f0be6a87b52f07436417c53d0fef24.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), |