Removes duplicated definition of SetArgumentPointee (by Vlad Losev); Makes gmock compilable on platforms that don't have ::abort() (by Acadeli Checa); Fixes compatibility with Symbian's STLport (by Acadeli Checa).

2 files changed, 11 insertions, 9 deletions

diff --git a/src/gmock-internal-utils.cc b/src/gmock-internal-utils.cc
index 0e693c70..e72e019b 100644
--- a/src/gmock-internal-utils.cc
+++ b/src/gmock-internal-utils.cc
@@ -80,7 +80,7 @@ class GoogleTestFailureReporter : public FailureReporterInterface {
     AssertHelper(type == FATAL ? TPRT_FATAL_FAILURE : TPRT_NONFATAL_FAILURE,
                  file, line, message.c_str()) = Message();
     if (type == FATAL) {
-      abort();
+      posix::Abort();
     }
   }
 };
diff --git a/src/gmock-spec-builders.cc b/src/gmock-spec-builders.cc
index 00d16918..94ba24bb 100644
--- a/src/gmock-spec-builders.cc
+++ b/src/gmock-spec-builders.cc
@@ -186,7 +186,9 @@ class MockObjectRegistry {
   // object alive.  Therefore we report any living object as test
   // failure, unless the user explicitly asked us to ignore it.
   ~MockObjectRegistry() {
-    using ::std::cout;
+
+    // "using ::std::cout;" doesn't work with Symbian's STLport, where cout is
+    // a macro.
 
     if (!GMOCK_FLAG(catch_leaked_mocks))
       return;
@@ -199,24 +201,24 @@ class MockObjectRegistry {
 
       // TODO(wan@google.com): Print the type of the leaked object.
       // This can help the user identify the leaked object.
-      cout << "\n";
+      std::cout << "\n";
       const MockObjectState& state = it->second;
       internal::FormatFileLocation(
-          state.first_used_file, state.first_used_line, &cout);
-      cout << " ERROR: this mock object";
+          state.first_used_file, state.first_used_line, &std::cout);
+      std::cout << " ERROR: this mock object";
       if (state.first_used_test != "") {
-        cout << " (used in test " << state.first_used_test_case << "."
+        std::cout << " (used in test " << state.first_used_test_case << "."
              << state.first_used_test << ")";
       }
-      cout << " should be deleted but never is. Its address is @"
+      std::cout << " should be deleted but never is. Its address is @"
            << it->first << ".";
       leaked_count++;
     }
     if (leaked_count > 0) {
-      cout << "\nERROR: " << leaked_count
+      std::cout << "\nERROR: " << leaked_count
            << " leaked mock " << (leaked_count == 1 ? "object" : "objects")
            << " found at program exit.\n";
-      cout.flush();
+      std::cout.flush();
       ::std::cerr.flush();
       // RUN_ALL_TESTS() has already returned when this destructor is
       // called.  Therefore we cannot use the normal Google Test