diff options
| author | Herbert Thielen <thielen@hs-worms.de> | 2017-08-09 11:03:27 +0200 |
|---|---|---|
| committer | Herbert Thielen <thielen@hs-worms.de> | 2017-08-09 11:03:27 +0200 |
| commit | e022dcded846c36c14dcbf97d49de9ca68ddd6fc (patch) | |
| tree | 8e65719ddf45c8f99b2ceae1a8dc24c84d7f2a90 /googlemock/test/gmock-generated-actions_test.cc | |
| parent | 6b896774815127c11de3aa4400454e88b9763020 (diff) | |
| parent | 461713fec4603806d2049835c0790bf94d2db631 (diff) | |
| download | googletest-e022dcded846c36c14dcbf97d49de9ca68ddd6fc.tar.gz googletest-e022dcded846c36c14dcbf97d49de9ca68ddd6fc.tar.bz2 googletest-e022dcded846c36c14dcbf97d49de9ca68ddd6fc.zip | |
Merge branch 'master' into hethi/remove-old-docs
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), |