2 files changed, 25 insertions, 0 deletions
diff --git a/include/gtest/internal/gtest-internal.h b/include/gtest/internal/gtest-internal.h
index 9e353b63..37faaaeb 100644
--- a/include/gtest/internal/gtest-internal.h
+++ b/include/gtest/internal/gtest-internal.h
@@ -121,6 +121,9 @@ class UnitTestImpl;                    // Opaque implementation of UnitTest
 template <typename E> class List;      // A generic list.
 template <typename E> class ListNode;  // A node in a generic list.
 
+// How many times InitGoogleTest() has been called.
+extern int g_init_gtest_count;
+
 // The text used in failure messages to indicate the start of the
 // stack trace.
 extern const char kStackTraceMarker[];
diff --git a/include/gtest/internal/gtest-string.h b/include/gtest/internal/gtest-string.h
index b37ff4f4..178f14e1 100644
--- a/include/gtest/internal/gtest-string.h
+++ b/include/gtest/internal/gtest-string.h
@@ -44,6 +44,10 @@
 #include <string.h>
 #include <gtest/internal/gtest-port.h>
 
+#if GTEST_HAS_GLOBAL_STRING || GTEST_HAS_STD_STRING
+#include <string>
+#endif  // GTEST_HAS_GLOBAL_STRING || GTEST_HAS_STD_STRING
+
 namespace testing {
 namespace internal {
 
@@ -217,6 +221,24 @@ class String {
   // doesn't need to be virtual.
   ~String() { delete[] c_str_; }
 
+  // Allows a String to be implicitly converted to an ::std::string or
+  // ::string, and vice versa.  Converting a String containing a NULL
+  // pointer to ::std::string or ::string is undefined behavior.
+  // Converting a ::std::string or ::string containing an embedded NUL
+  // character to a String will result in the prefix up to the first
+  // NUL character.
+#if GTEST_HAS_STD_STRING
+  String(const ::std::string& str) : c_str_(NULL) { *this = str.c_str(); }
+
+  operator ::std::string() const { return ::std::string(c_str_); }
+#endif  // GTEST_HAS_STD_STRING
+
+#if GTEST_HAS_GLOBAL_STRING
+  String(const ::string& str) : c_str_(NULL) { *this = str.c_str(); }
+
+  operator ::string() const { return ::string(c_str_); }
+#endif  // GTEST_HAS_GLOBAL_STRING
+
   // Returns true iff this is an empty string (i.e. "").
   bool empty() const {
     return (c_str_ != NULL) && (*c_str_ == '\0');