commit ccedc1c93371e3b3826bc2d83b77ab1a26d07dc6
author zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> Mon Aug 09 22:46:12 2010 +0000
committer zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> Mon Aug 09 22:46:12 2010 +0000
tree 28b7c20425e0a359c7d2cd48f252cfed53c51b14
parent c6333dca1c94ef434257c54ede69adace6e32e1c

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

include/gmock/gmock-generated-function-mockers.h

diff --git a/include/gmock/gmock-generated-function-mockers.h b/include/gmock/gmock-generated-function-mockers.h
index 58be7e1..6509086 100644
--- a/include/gmock/gmock-generated-function-mockers.h
+++ b/include/gmock/gmock-generated-function-mockers.h
@@ -339,7 +339,7 @@
 // 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) \