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).

2009-08-07 07:15:56 +00:00
parent a18423e0ee
commit 9571b28675
5 changed files with 27 additions and 53 deletions
--- a/include/gmock/internal/gmock-port.h
+++ b/include/gmock/internal/gmock-port.h
@@ -274,7 +274,7 @@ class GMockCheckProvider {
  }
  ~GMockCheckProvider() {
    ::std::cerr << ::std::endl;
-    abort();
+    posix::Abort();
  }
  ::std::ostream& GetStream() { return ::std::cerr; }
 };