diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-02 10:54:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-02 10:54:26 -0500 |
| commit | fa6730103ecaad750f42700c55a92c3e212a9271 (patch) | |
| tree | 3c9e1638dc96dfe918b73e87d4b389d3bbe5dd86 /googlemock/test/gmock-generated-actions_test.cc | |
| parent | ca6a70c6082ff526b993c622d192c6d519800bc2 (diff) | |
| parent | 1c2f1907047216654599b0057df49d21a2c1400a (diff) | |
| download | googletest-fa6730103ecaad750f42700c55a92c3e212a9271.tar.gz googletest-fa6730103ecaad750f42700c55a92c3e212a9271.tar.bz2 googletest-fa6730103ecaad750f42700c55a92c3e212a9271.zip | |
Merge branch 'master' into uintptr
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 03908588..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 parameters. +// Tests that ACTION_TEMPLATE works for a template with template parameters. ACTION_TEMPLATE(ReturnSmartPointer, HAS_1_TEMPLATE_PARAMS(template <typename Pointee> class, Pointer), |