diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-08-09 22:46:12 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-08-09 22:46:12 +0000 |
| commit | ccedc1c93371e3b3826bc2d83b77ab1a26d07dc6 (patch) | |
| tree | 28b7c20425e0a359c7d2cd48f252cfed53c51b14 /include/gmock/gmock-generated-actions.h | |
| parent | c6333dca1c94ef434257c54ede69adace6e32e1c (diff) | |
| download | googletest-ccedc1c93371e3b3826bc2d83b77ab1a26d07dc6.tar.gz googletest-ccedc1c93371e3b3826bc2d83b77ab1a26d07dc6.tar.bz2 googletest-ccedc1c93371e3b3826bc2d83b77ab1a26d07dc6.zip | |
Removes some gmock internal macros; sorts the file lists in Makefile.am; picks up gtest r454.
Diffstat (limited to 'include/gmock/gmock-generated-actions.h')
| -rw-r--r-- | include/gmock/gmock-generated-actions.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gmock/gmock-generated-actions.h b/include/gmock/gmock-generated-actions.h index 2b53c7b9..65652f8e 100644 --- a/include/gmock/gmock-generated-actions.h +++ b/include/gmock/gmock-generated-actions.h @@ -1378,7 +1378,7 @@ DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4, Action5 a5, Action6 a6, // The name of the class template implementing the action template. #define GMOCK_ACTION_CLASS_(name, value_params)\ - GMOCK_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params) + GTEST_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params) #define ACTION_TEMPLATE(name, template_params, value_params)\ template <GMOCK_INTERNAL_DECL_##template_params\ |