Picks up gtest r314.

2009-09-18 18:17:19 +00:00
parent 93244dc369
commit bbd6e105e7
2 changed files with 7 additions and 3 deletions
--- a/src/gmock-internal-utils.cc
+++ b/src/gmock-internal-utils.cc
@@ -77,8 +77,12 @@ class GoogleTestFailureReporter : public FailureReporterInterface {
 public:
  virtual void ReportFailure(FailureType type, const char* file, int line,
                             const string& message) {
-    AssertHelper(type == FATAL ? TPRT_FATAL_FAILURE : TPRT_NONFATAL_FAILURE,
-                 file, line, message.c_str()) = Message();
+    AssertHelper(type == FATAL ?
+                 TestPartResult::kFatalFailure :
+                 TestPartResult::kNonFatalFailure,
+                 file,
+                 line,
+                 message.c_str()) = Message();
    if (type == FATAL) {
      posix::Abort();
    }