aboutsummaryrefslogtreecommitdiffstats
path: root/include/gtest/internal/gtest-string.h
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2010-03-04 22:15:53 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2010-03-04 22:15:53 +0000
commit12a92c26fc0e0de81f687dbe739a6aa24f37f9dd (patch)
tree9a7a9aac24a5946d5bca4e04ec681ecd38b6199c /include/gtest/internal/gtest-string.h
parent0928f00c6b995af037b787b710fde509267ad624 (diff)
downloadgoogletest-12a92c26fc0e0de81f687dbe739a6aa24f37f9dd.tar.gz
googletest-12a92c26fc0e0de81f687dbe739a6aa24f37f9dd.tar.bz2
googletest-12a92c26fc0e0de81f687dbe739a6aa24f37f9dd.zip
Renames ThreadStartSempahore to Notificaton (by Vlad Losev); adds threading tests for SCOPED_TRACE() (by Vlad Losev); replaces native pthread calls with gtest's threading constructs (by Vlad Losev); fixes flakiness in CountedDestructor (by Vlad Losev); minor MSVC 7.1 clean-up (by Zhanyong Wan).
Diffstat (limited to 'include/gtest/internal/gtest-string.h')
-rw-r--r--include/gtest/internal/gtest-string.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/include/gtest/internal/gtest-string.h b/include/gtest/internal/gtest-string.h
index 6f9ba052..280645e6 100644
--- a/include/gtest/internal/gtest-string.h
+++ b/include/gtest/internal/gtest-string.h
@@ -51,14 +51,13 @@ namespace internal {
// String - a UTF-8 string class.
//
-// We cannot use std::string as Microsoft's STL implementation in
-// Visual C++ 7.1 has problems when exception is disabled. There is a
-// hack to work around this, but we've seen cases where the hack fails
-// to work.
+// For historic reasons, we don't use std::string.
//
-// Also, String is different from std::string in that it can represent
-// both NULL and the empty string, while std::string cannot represent
-// NULL.
+// TODO(wan@google.com): replace this class with std::string or
+// implement it in terms of the latter.
+//
+// Note that String can represent both NULL and the empty string,
+// while std::string cannot represent NULL.
//
// NULL and the empty string are considered different. NULL is less
// than anything (including the empty string) except itself.