diff options
author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-12-29 19:45:33 (GMT) |
---|---|---|
committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-12-29 19:45:33 (GMT) |
commit | 1d6df4be08e71c8a9d600799cc17bfd7d62838fc (patch) | |
tree | 9724b22e0f9f6246598921fb5ce4585199d4fde4 /samples | |
parent | 4d004650c9aa48fcad827d0096b773e3b59727ef (diff) | |
download | googletest-1d6df4be08e71c8a9d600799cc17bfd7d62838fc.zip googletest-1d6df4be08e71c8a9d600799cc17bfd7d62838fc.tar.gz googletest-1d6df4be08e71c8a9d600799cc17bfd7d62838fc.tar.bz2 |
Adds an experimental CMake build script; makes the samples compile without warnings on Windows.
Diffstat (limited to 'samples')
-rw-r--r-- | samples/prime_tables.h | 3 | ||||
-rw-r--r-- | samples/sample10_unittest.cc | 6 | ||||
-rw-r--r-- | samples/sample9_unittest.cc | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/samples/prime_tables.h b/samples/prime_tables.h index 236e84c..8b6cab4 100644 --- a/samples/prime_tables.h +++ b/samples/prime_tables.h @@ -115,6 +115,9 @@ class PreCalculatedPrimeTable : public PrimeTable { const int is_prime_size_; bool* const is_prime_; + + // Disables compiler wqarning "assignment operator could ot be generated." + void operator=(const PreCalculatedPrimeTable& rhs); }; #endif // GTEST_SAMPLES_PRIME_TABLES_H_ diff --git a/samples/sample10_unittest.cc b/samples/sample10_unittest.cc index 703ec6e..3ad6fd6 100644 --- a/samples/sample10_unittest.cc +++ b/samples/sample10_unittest.cc @@ -58,7 +58,7 @@ class Water { return malloc(allocation_size); } - void operator delete(void* block, size_t allocation_size) { + void operator delete(void* block, size_t /* allocation_size */) { allocated_--; free(block); } @@ -78,12 +78,12 @@ int Water::allocated_ = 0; class LeakChecker : public EmptyTestEventListener { private: // Called before a test starts. - virtual void OnTestStart(const TestInfo& test_info) { + virtual void OnTestStart(const TestInfo& /* test_info */) { initially_allocated_ = Water::allocated(); } // Called after a test ends. - virtual void OnTestEnd(const TestInfo& test_info) { + virtual void OnTestEnd(const TestInfo& /* test_info */) { int difference = Water::allocated() - initially_allocated_; // You can generate a failure in any event handler except diff --git a/samples/sample9_unittest.cc b/samples/sample9_unittest.cc index 8944c47..d828ef4 100644 --- a/samples/sample9_unittest.cc +++ b/samples/sample9_unittest.cc @@ -52,7 +52,7 @@ namespace { class TersePrinter : public EmptyTestEventListener { private: // Called before any test activity starts. - virtual void OnTestProgramStart(const UnitTest& unit_test) {} + virtual void OnTestProgramStart(const UnitTest& /* unit_test */) {} // Called after all test activities have ended. virtual void OnTestProgramEnd(const UnitTest& unit_test) { |