From 153d45062de2a7fac1e40de6365c79f14017b36c Mon Sep 17 00:00:00 2001
From: pi-tvd <tvd@planetinnovation.com.au>
Date: Fri, 1 Mar 2013 14:17:45 +1100
Subject: [PATCH 1/3] CXXTEST_HAVE_STD is nolonger forced in TestMain.h. Will
 not pull in stdio

---
 cxxtest/TestMain.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/cxxtest/TestMain.h b/cxxtest/TestMain.h
index 56c6bdc..5c19e2c 100644
--- a/cxxtest/TestMain.h
+++ b/cxxtest/TestMain.h
@@ -15,12 +15,11 @@
 #include <cxxtest/TestTracker.h>
 #include <cxxtest/Flags.h>
 
-#ifndef _CXXTEST_HAVE_STD
-#   define _CXXTEST_HAVE_STD
-#endif // _CXXTEST_HAVE_STD
 
 #include <cxxtest/StdValueTraits.h>
 
+
+    
 #if defined(_CXXTEST_HAVE_STD)
 #ifdef _CXXTEST_OLD_STD
 #   include <iostream.h>
@@ -30,6 +29,7 @@
 #   include <cstring>
 #endif // _CXXTEST_OLD_STD
 
+
 namespace CxxTest {
 
 inline void print_help(const char* name) {
@@ -40,6 +40,8 @@ inline void print_help(const char* name) {
     CXXTEST_STD(cerr) << name << " --help-tests" << CXXTEST_STD(endl);
     CXXTEST_STD(cerr) << name << " -v             Enable tracing output." << CXXTEST_STD(endl);
 }
+#else
+namespace CxxTest {
 #endif
 
 

From 0e128ee23af68ffaedd267041f7dcaaaed589972 Mon Sep 17 00:00:00 2001
From: pi-tvd <tvd@planetinnovation.com.au>
Date: Fri, 1 Mar 2013 14:22:23 +1100
Subject: [PATCH 2/3] removed rogue call to fflush using stdout

---
 cxxtest/ErrorFormatter.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cxxtest/ErrorFormatter.h b/cxxtest/ErrorFormatter.h
index cf967bf..f64595f 100644
--- a/cxxtest/ErrorFormatter.h
+++ b/cxxtest/ErrorFormatter.h
@@ -84,7 +84,6 @@ class ErrorFormatter : public TestListener {
         if (!tracker().testFailed()) {
             (*_o) << ".";
             _o->flush();
-            fflush(stdout);
             _dotting = true;
         }
     }

From 2be53cc2f4e077f431cbe4e47f48097c14558965 Mon Sep 17 00:00:00 2001
From: pi-tvd <tvd@planetinnovation.com.au>
Date: Fri, 24 May 2013 16:17:16 +1000
Subject: [PATCH 3/3] removing rogue call to fflush using stdout (a previous
 change that got trashed in the recent merged?)

---
 cxxtest/ErrorFormatter.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cxxtest/ErrorFormatter.h b/cxxtest/ErrorFormatter.h
index 18d2552..ce0cec1 100644
--- a/cxxtest/ErrorFormatter.h
+++ b/cxxtest/ErrorFormatter.h
@@ -84,7 +84,6 @@ class ErrorFormatter : public TestListener {
         if (tracker().testSkipped()) {
             (*_o) << "s";
             _o->flush();
-            fflush(stdout);
             _dotting = true;
         } else if (!tracker().testFailed()) {
             (*_o) << ".";