From 44a041b711ff4a5b5f341f21127aed46dbfe38ad Mon Sep 17 00:00:00 2001
From: "zhanyong.wan" <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>
Date: Wed, 11 Mar 2009 18:31:26 +0000
Subject: Fixes death-test-related tests on Windows, by Vlad Losev.

---
 src/gtest-internal-inl.h | 7 ++++---
 src/gtest-typed-test.cc  | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/gtest-internal-inl.h b/src/gtest-internal-inl.h
index de5124d7..d079a3e1 100644
--- a/src/gtest-internal-inl.h
+++ b/src/gtest-internal-inl.h
@@ -49,16 +49,17 @@
 #include <stddef.h>
 #include <stdlib.h>   // For strtoll/_strtoul64.
 
+#include <string>
+
+#include <gtest/internal/gtest-port.h>
+
 #if GTEST_OS_WINDOWS
 #include <windows.h>  // For DWORD.
 #endif  // GTEST_OS_WINDOWS
 
-#include <gtest/internal/gtest-port.h>
 #include <gtest/gtest.h>
 #include <gtest/gtest-spi.h>
 
-#include <string>
-
 namespace testing {
 
 // Declares the flags.
diff --git a/src/gtest-typed-test.cc b/src/gtest-typed-test.cc
index cb91f2b2..e45e2abb 100644
--- a/src/gtest-typed-test.cc
+++ b/src/gtest-typed-test.cc
@@ -85,6 +85,7 @@ const char* TypedTestCasePState::VerifyRegisteredTestNames(
   if (errors_str != "") {
     fprintf(stderr, "%s %s", FormatFileLocation(file, line).c_str(),
             errors_str.c_str());
+    fflush(stderr);
     abort();
   }
 
-- 
cgit v1.2.3