diff options
author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-30 20:23:50 (GMT) |
---|---|---|
committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-30 20:23:50 (GMT) |
commit | f8b268ee86ca74bba3276352f1e7de53d1336c3e (patch) | |
tree | 37e8c4680f5f6763c18aaa2739446c8ba08501f4 /samples | |
parent | b50ef44a3527d958270ff1f08cb99e3ac633bd17 (diff) | |
download | googletest-f8b268ee86ca74bba3276352f1e7de53d1336c3e.zip googletest-f8b268ee86ca74bba3276352f1e7de53d1336c3e.tar.gz googletest-f8b268ee86ca74bba3276352f1e7de53d1336c3e.tar.bz2 |
Makes gtest compile cleanly with MSVC's /W4 (by Zhanyong Wan).
Renames EventListenrs to TestEventListeners (by Zhanyong Wan).
Fixes invalid characters in XML report (by Vlad Losev).
Refacotrs SConscript (by Vlad Losev).
Diffstat (limited to 'samples')
-rw-r--r-- | samples/sample10_unittest.cc | 4 | ||||
-rw-r--r-- | samples/sample9_unittest.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/samples/sample10_unittest.cc b/samples/sample10_unittest.cc index e136859..703ec6e 100644 --- a/samples/sample10_unittest.cc +++ b/samples/sample10_unittest.cc @@ -37,10 +37,10 @@ #include <gtest/gtest.h> using ::testing::EmptyTestEventListener; -using ::testing::EventListeners; using ::testing::InitGoogleTest; using ::testing::Test; using ::testing::TestCase; +using ::testing::TestEventListeners; using ::testing::TestInfo; using ::testing::TestPartResult; using ::testing::UnitTest; @@ -123,7 +123,7 @@ int main(int argc, char **argv) { // If we are given the --check_for_leaks command line flag, installs the // leak checker. if (check_for_leaks) { - EventListeners& listeners = UnitTest::GetInstance()->listeners(); + TestEventListeners& listeners = UnitTest::GetInstance()->listeners(); // Adds the leak checker to the end of the test event listener list, // after the default text output printer and the default XML report diff --git a/samples/sample9_unittest.cc b/samples/sample9_unittest.cc index 9bf865e..8944c47 100644 --- a/samples/sample9_unittest.cc +++ b/samples/sample9_unittest.cc @@ -37,10 +37,10 @@ #include <gtest/gtest.h> using ::testing::EmptyTestEventListener; -using ::testing::EventListeners; using ::testing::InitGoogleTest; using ::testing::Test; using ::testing::TestCase; +using ::testing::TestEventListeners; using ::testing::TestInfo; using ::testing::TestPartResult; using ::testing::UnitTest; @@ -120,7 +120,7 @@ int main(int argc, char **argv) { // If we are given the --terse_output command line flag, suppresses the // standard output and attaches own result printer. if (terse_output) { - EventListeners& listeners = unit_test.listeners(); + TestEventListeners& listeners = unit_test.listeners(); // Removes the default console output listener from the list so it will // not receive events from Google Test and won't print any output. Since |