generic-library/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removes some gmock internal macros; sorts the file lists in Makefile.am; picks up gtest r454.

Browse Source
This commit is contained in:
zhanyong.wan
2010-08-09 22:46:12 +00:00
parent c6333dca1c
commit ccedc1c933
7 changed files with 60 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/gmock/gmock-generated-function-mockers.h
View File

@@ -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) \