diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-30 20:23:50 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-30 20:23:50 +0000 |
| commit | f6d087b78d230d875bf5d8281112662795044680 (patch) | |
| tree | 37e8c4680f5f6763c18aaa2739446c8ba08501f4 /src/gtest-internal-inl.h | |
| parent | fff033497b70e96a5dcadb6ba9570c12b5921d74 (diff) | |
| download | gtest-f6d087b78d230d875bf5d8281112662795044680.tar.gz gtest-f6d087b78d230d875bf5d8281112662795044680.tar.bz2 gtest-f6d087b78d230d875bf5d8281112662795044680.tar.xz | |
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).
git-svn-id: http://googletest.googlecode.com/svn/trunk@321 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'src/gtest-internal-inl.h')
| -rw-r--r-- | src/gtest-internal-inl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gtest-internal-inl.h b/src/gtest-internal-inl.h index 9826bdd..d593e82 100644 --- a/src/gtest-internal-inl.h +++ b/src/gtest-internal-inl.h @@ -742,7 +742,7 @@ class UnitTestImpl { } // Provides access to the event listener list. - EventListeners* listeners() { return &listeners_; } + TestEventListeners* listeners() { return &listeners_; } // Returns the TestResult for the test that's currently running, or // the TestResult for the ad hoc test if no test is running. @@ -1002,7 +1002,7 @@ class UnitTestImpl { // The list of event listeners that can be used to track events inside // Google Test. - EventListeners listeners_; + TestEventListeners listeners_; // The OS stack trace getter. Will be deleted when the UnitTest // object is destructed. By default, an OsStackTraceGetter is used, |