diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-01-11 16:31:23 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-01-11 16:31:23 (GMT) |
| commit | 6914ae239499b99ab8b3fcbc7c8b584875e29e1b (patch) | |
| tree | 47107a3f74573777e2b994f18143483dfb602378 /googletest/include/gtest/gtest.h | |
| parent | 1d757db65cd12679c2d2213aa3430809b6566ef2 (diff) | |
| download | googletest-6914ae239499b99ab8b3fcbc7c8b584875e29e1b.zip googletest-6914ae239499b99ab8b3fcbc7c8b584875e29e1b.tar.gz googletest-6914ae239499b99ab8b3fcbc7c8b584875e29e1b.tar.bz2 | |
Upstream cl 103120214
Diffstat (limited to 'googletest/include/gtest/gtest.h')
| -rw-r--r-- | googletest/include/gtest/gtest.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index 2ad5a0c..5720112 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -2110,9 +2110,14 @@ GTEST_API_ AssertionResult DoubleLE(const char* expr1, const char* expr2, // of the dummy variable name, thus allowing multiple SCOPED_TRACE()s // to appear in the same block - as long as they are on different // lines. +// +// Assuming that each thread maintains its own stack of traces. +// Therefore, a SCOPED_TRACE() would (correctly) only affect the +// assertions in its own thread. #define SCOPED_TRACE(message) \ ::testing::internal::ScopedTrace GTEST_CONCAT_TOKEN_(gtest_trace_, __LINE__)(\ - __FILE__, __LINE__, ::testing::Message() << (message)) + __FILE__, __LINE__, (message)) + // Compile-time assertion for type equality. // StaticAssertTypeEq<type1, type2>() compiles iff type1 and type2 are |