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

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

View File

@@ -605,7 +605,7 @@ $if i==1 [[P]] $elif i>=2 [[P$i]]
// 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)
$range k 0..n-1