diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-08-07 07:15:56 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-08-07 07:15:56 +0000 |
| commit | 9571b28675a5a602ed3c8a7acf270d03aca69c96 (patch) | |
| tree | 787fabc0e1b32018bff805f4acd84f23d045fbe7 /include/gmock/internal/gmock-port.h | |
| parent | a18423e0ee0c5cfe69948e4f4d0826dc8fe15f8c (diff) | |
| download | googletest-9571b28675a5a602ed3c8a7acf270d03aca69c96.tar.gz googletest-9571b28675a5a602ed3c8a7acf270d03aca69c96.tar.bz2 googletest-9571b28675a5a602ed3c8a7acf270d03aca69c96.zip | |
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).
Diffstat (limited to 'include/gmock/internal/gmock-port.h')
| -rw-r--r-- | include/gmock/internal/gmock-port.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gmock/internal/gmock-port.h b/include/gmock/internal/gmock-port.h index 9ee8f728..5b00a41a 100644 --- 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; } }; |