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/gmock-spec-builders.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/gmock-spec-builders.h')
| -rw-r--r-- | include/gmock/gmock-spec-builders.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gmock/gmock-spec-builders.h b/include/gmock/gmock-spec-builders.h index 7038c2e4..27d2b747 100644 --- a/include/gmock/gmock-spec-builders.h +++ b/include/gmock/gmock-spec-builders.h @@ -537,7 +537,7 @@ class InSequence { bool sequence_created_; GTEST_DISALLOW_COPY_AND_ASSIGN_(InSequence); // NOLINT -} GMOCK_ATTRIBUTE_UNUSED_; +} GTEST_ATTRIBUTE_UNUSED_; namespace internal { |