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-function-mockers.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-function-mockers.h')
| -rw-r--r-- | include/gmock/gmock-generated-function-mockers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gmock/gmock-generated-function-mockers.h b/include/gmock/gmock-generated-function-mockers.h index 58be7e19..65090861 100644 --- a/include/gmock/gmock-generated-function-mockers.h +++ b/include/gmock/gmock-generated-function-mockers.h @@ -339,7 +339,7 @@ using internal::FunctionMocker; // The variable for mocking the given method. // INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!! #define GMOCK_MOCKER_(arity, constness, Method) \ - GMOCK_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__) + GTEST_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__) // INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!! #define GMOCK_METHOD0_(tn, constness, ct, Method, F) \ |