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 /include/gtest/gtest.h | |
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 'include/gtest/gtest.h')
-rw-r--r-- | include/gtest/gtest.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/gtest/gtest.h b/include/gtest/gtest.h index 2f15fa3..6fc5ac5 100644 --- a/include/gtest/gtest.h +++ b/include/gtest/gtest.h @@ -146,13 +146,13 @@ namespace internal { class AssertHelper; class DefaultGlobalTestPartResultReporter; -class EventListenersAccessor; class ExecDeathTest; class NoExecDeathTest; class FinalSuccessChecker; class GTestFlagSaver; class TestInfoImpl; class TestResultAccessor; +class TestEventListenersAccessor; class TestEventRepeater; class WindowsDeathTest; class UnitTestImpl* GetUnitTestImpl(); @@ -832,11 +832,11 @@ class EmptyTestEventListener : public TestEventListener { virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) {} }; -// EventListeners lets users add listeners to track events in Google Test. -class EventListeners { +// TestEventListeners lets users add listeners to track events in Google Test. +class TestEventListeners { public: - EventListeners(); - ~EventListeners(); + TestEventListeners(); + ~TestEventListeners(); // Appends an event listener to the end of the list. Google Test assumes // the ownership of the listener (i.e. it will delete the listener when @@ -871,8 +871,8 @@ class EventListeners { private: friend class TestCase; friend class internal::DefaultGlobalTestPartResultReporter; - friend class internal::EventListenersAccessor; friend class internal::NoExecDeathTest; + friend class internal::TestEventListenersAccessor; friend class internal::TestInfoImpl; friend class internal::UnitTestImpl; @@ -906,8 +906,8 @@ class EventListeners { // Listener responsible for the creation of the XML output file. TestEventListener* default_xml_generator_; - // We disallow copying EventListeners. - GTEST_DISALLOW_COPY_AND_ASSIGN_(EventListeners); + // We disallow copying TestEventListeners. + GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventListeners); }; // A UnitTest consists of a vector of TestCases. @@ -1002,7 +1002,7 @@ class UnitTest { // Returns the list of event listeners that can be used to track events // inside Google Test. - EventListeners& listeners(); + TestEventListeners& listeners(); private: // Registers and returns a global test environment. When a test |