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

2010-08-09 22:46:12 +00:00
parent c6333dca1c
commit ccedc1c933
7 changed files with 60 additions and 67 deletions
--- 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 {