diff options
author | Fedor Trushkin <ftrushkin@google.com> | 2018-01-17 16:41:59 +0100 |
---|---|---|
committer | Fedor Trushkin <ftrushkin@google.com> | 2018-01-17 16:41:59 +0100 |
commit | 9c82e7745c257f38d7dd7ff8a9759ea58b6a4e89 (patch) | |
tree | 9e5187d044021cafe561dd8e63016a0cc4877c1f /googletest/src | |
parent | 1b077667bd950be0f5b106e033fb820b008ad0c0 (diff) | |
download | googletest-9c82e7745c257f38d7dd7ff8a9759ea58b6a4e89.tar.gz googletest-9c82e7745c257f38d7dd7ff8a9759ea58b6a4e89.tar.bz2 googletest-9c82e7745c257f38d7dd7ff8a9759ea58b6a4e89.zip |
Expose ScopedTrace utility in public interface
Diffstat (limited to 'googletest/src')
-rw-r--r-- | googletest/src/gtest.cc | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 0aeeb8e7..ccaf99d2 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -3835,26 +3835,6 @@ void StreamingListener::SocketWriter::MakeConnection() { // End of class Streaming Listener #endif // GTEST_CAN_STREAM_RESULTS__ -// Class ScopedTrace - -// Pushes the given source file location and message onto a per-thread -// trace stack maintained by Google Test. -void ScopedTrace::PushTrace(const char* file, int line, std::string message) { - TraceInfo trace; - trace.file = file; - trace.line = line; - trace.message.swap(message); - - UnitTest::GetInstance()->PushGTestTrace(trace); -} - -// Pops the info pushed by the c'tor. -ScopedTrace::~ScopedTrace() - GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) { - UnitTest::GetInstance()->PopGTestTrace(); -} - - // class OsStackTraceGetter const char* const OsStackTraceGetterInterface::kElidedFramesMarker = @@ -5415,4 +5395,23 @@ std::string TempDir() { #endif // GTEST_OS_WINDOWS_MOBILE } +// Class ScopedTrace + +// Pushes the given source file location and message onto a per-thread +// trace stack maintained by Google Test. +void ScopedTrace::PushTrace(const char* file, int line, std::string message) { + internal::TraceInfo trace; + trace.file = file; + trace.line = line; + trace.message.swap(message); + + UnitTest::GetInstance()->PushGTestTrace(trace); +} + +// Pops the info pushed by the c'tor. +ScopedTrace::~ScopedTrace() + GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) { + UnitTest::GetInstance()->PopGTestTrace(); +} + } // namespace testing |