Makes gmock-spec-builders_test.cc and gmock-internal-utils_test.cc work where both ::string and ::std::string are defined.

2 files changed, 20 insertions, 2 deletions

diff --git a/test/gmock-internal-utils_test.cc b/test/gmock-internal-utils_test.cc
index 9ab15af2..20289288 100644
--- a/test/gmock-internal-utils_test.cc
+++ b/test/gmock-internal-utils_test.cc
@@ -501,7 +501,16 @@ TEST(ExpectTest, FailsNonfatallyOnFalse) {
 
 class LogIsVisibleTest : public ::testing::Test {
  protected:
-  virtual void SetUp() { original_verbose_ = GMOCK_FLAG(verbose); }
+  virtual void SetUp() {
+    // The code needs to work when both ::string and ::std::string are
+    // defined and the flag is implemented as a
+    // testing::internal::String.  In this case, without the call to
+    // c_str(), the compiler will complain that it cannot figure out
+    // whether the String flag should be converted to a ::string or an
+    // ::std::string before being assigned to original_verbose_.
+    original_verbose_ = GMOCK_FLAG(verbose).c_str();
+  }
+
   virtual void TearDown() { GMOCK_FLAG(verbose) = original_verbose_; }
 
   string original_verbose_;
diff --git a/test/gmock-spec-builders_test.cc b/test/gmock-spec-builders_test.cc
index 058d343c..614e4ab5 100644
--- a/test/gmock-spec-builders_test.cc
+++ b/test/gmock-spec-builders_test.cc
@@ -1628,7 +1628,16 @@ class LogTestHelper {
 
 class GMockLogTest : public ::testing::Test {
  protected:
-  virtual void SetUp() { original_verbose_ = GMOCK_FLAG(verbose); }
+  virtual void SetUp() {
+    // The code needs to work when both ::string and ::std::string are
+    // defined and the flag is implemented as a
+    // testing::internal::String.  In this case, without the call to
+    // c_str(), the compiler will complain that it cannot figure out
+    // whether the String flag should be converted to a ::string or an
+    // ::std::string before being assigned to original_verbose_.
+    original_verbose_ = GMOCK_FLAG(verbose).c_str();
+  }
+
   virtual void TearDown() { GMOCK_FLAG(verbose) = original_verbose_; }
 
   LogTestHelper helper_;