Fixes a slew of compiler warnings and turns on "warning as error" in the scons build.

2009-12-23 00:13:23 +00:00
parent 284b54d304
commit 32de5f5376
31 changed files with 703 additions and 105 deletions
--- a/include/gmock/gmock-generated-nice-strict.h
+++ b/include/gmock/gmock-generated-nice-strict.h
@@ -155,6 +155,9 @@ class NiceMock : public MockClass {
    ::testing::Mock::UnregisterCallReaction(
        internal::implicit_cast<MockClass*>(this));
  }
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(NiceMock);
 };

 template <class MockClass>
@@ -246,6 +249,9 @@ class StrictMock : public MockClass {
    ::testing::Mock::UnregisterCallReaction(
        internal::implicit_cast<MockClass*>(this));
  }
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(StrictMock);
 };

 // The following specializations catch some (relatively more common)