From ccedc1c93371e3b3826bc2d83b77ab1a26d07dc6 Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Mon, 9 Aug 2010 22:46:12 +0000 Subject: Removes some gmock internal macros; sorts the file lists in Makefile.am; picks up gtest r454. --- include/gmock/gmock-generated-actions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/gmock/gmock-generated-actions.h') 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