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/internal/gmock-internal-utils.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/internal/gmock-internal-utils.h')
| -rw-r--r-- | include/gmock/internal/gmock-internal-utils.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/gmock/internal/gmock-internal-utils.h b/include/gmock/internal/gmock-internal-utils.h index 69a23380..19ea89eb 100644 --- a/include/gmock/internal/gmock-internal-utils.h +++ b/include/gmock/internal/gmock-internal-utils.h @@ -46,17 +46,6 @@ #include <gmock/internal/gmock-port.h> #include <gtest/gtest.h> -// Concatenates two pre-processor symbols; works for concatenating -// built-in macros like __FILE__ and __LINE__. -#define GMOCK_CONCAT_TOKEN_IMPL_(foo, bar) foo##bar -#define GMOCK_CONCAT_TOKEN_(foo, bar) GMOCK_CONCAT_TOKEN_IMPL_(foo, bar) - -#ifdef __GNUC__ -#define GMOCK_ATTRIBUTE_UNUSED_ __attribute__ ((unused)) -#else -#define GMOCK_ATTRIBUTE_UNUSED_ -#endif // __GNUC__ - namespace testing { namespace internal { |