Fixes a thread annotation; updates CHANGES for 1.7.0
diff --git a/CHANGES b/CHANGES
index 4cdc381..f2968d6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,23 @@
Changes for 1.7.0:
-TO BE WRITTEN.
+* New feature: death tests are supported on OpenBSD and in iOS
+ simulator now.
+* New feature: Test::RecordProperty() can now be used outside of the
+ lifespan of a test method, in which case it will be attributed to
+ the current test case or the test program in the XML report.
+* New feature (potentially breaking): --gtest_list_tests now prints
+ the type parameters and value parameters for each test.
+* Improvement: char pointers and char arrays are now escaped properly
+ in failure messages.
+* Improvement: failure summary in XML reports now includes file and
+ line information.
+* Improvement: the <testsuites> XML element now has a timestamp attribute.
+* Fixed the bug where long --gtest_filter flag values are truncated in
+ death tests.
+* Potentially breaking change: RUN_ALL_TESTS() is now implemented as a
+ function instead of a macro in order to work better with Clang.
+* Compatibility fixes with C++ 11 and various platforms.
+* Bug/warning fixes.
Changes for 1.6.0:
diff --git a/src/gtest.cc b/src/gtest.cc
index b9b44a1..6b9d75d 100644
--- a/src/gtest.cc
+++ b/src/gtest.cc
@@ -3705,13 +3705,12 @@
// assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc) eventually call
// this to report their results. The user code should use the
// assertion macros instead of calling this directly.
-GTEST_LOCK_EXCLUDED_(mutex_)
void UnitTest::AddTestPartResult(
TestPartResult::Type result_type,
const char* file_name,
int line_number,
const std::string& message,
- const std::string& os_stack_trace) {
+ const std::string& os_stack_trace) GTEST_LOCK_EXCLUDED_(mutex_) {
Message msg;
msg << message;
