From 7d9fae8a05c54d9dbedda50b1e02b9d325638102 Mon Sep 17 00:00:00 2001
From: Gennadiy Rozental <rogeeff@gmail.com>
Date: Mon, 31 Jan 2005 20:03:28 +0000
Subject: [PATCH] use BOOST_WORKAROUND

[SVN r26971]
---
 test/parameterized_test_test.cpp | 11 +++++++----
 test/result_report_test.cpp      | 21 ++++++++++-----------
 test/test_case_template_test.cpp | 10 +++++++---
 test/token_iterator_test.cpp     |  5 ++++-
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/test/parameterized_test_test.cpp b/test/parameterized_test_test.cpp
index 68cca0ec..3bb2bd6b 100644
--- a/test/parameterized_test_test.cpp
+++ b/test/parameterized_test_test.cpp
@@ -17,12 +17,12 @@
 #include <boost/test/unit_test_result.hpp>
 #include <boost/test/test_tools.hpp>
 #include <boost/test/unit_test_log.hpp>
-#if !defined ( __GNUC__ ) || __GNUC__ > 2
-#include <boost/test/utils/nullstream.hpp>
-typedef boost::onullstream onullstream_type;
-#else
+#if BOOST_WORKAROUND(  __GNUC__, < 3 )
 #include <boost/test/output_test_stream.hpp>
 typedef boost::test_tools::output_test_stream onullstream_type;
+#else
+#include <boost/test/utils/nullstream.hpp>
+typedef boost::onullstream onullstream_type;
 #endif
 
 namespace utf=boost::unit_test;
@@ -199,6 +199,9 @@ int test_main( int, char* [] ) {
 //  Revision History :
 //  
 //  $Log$
+//  Revision 1.18  2005/01/31 20:01:39  rogeeff
+//  use BOOST_WORKAROUND
+//
 //  Revision 1.17  2005/01/30 03:35:55  rogeeff
 //  no message
 //
diff --git a/test/result_report_test.cpp b/test/result_report_test.cpp
index 80abdc3d..874b627e 100644
--- a/test/result_report_test.cpp
+++ b/test/result_report_test.cpp
@@ -20,9 +20,13 @@
 #include <boost/test/output_test_stream.hpp>
 #include <boost/test/unit_test_log.hpp>
 #include <boost/test/detail/unit_test_parameters.hpp>
-#if !defined ( __GNUC__ ) || __GNUC__ > 2
+#if BOOST_WORKAROUND(  __GNUC__, < 3 )
+typedef boost::test_tools::output_test_stream onullstream_type;
+#else
 #include <boost/test/utils/nullstream.hpp>
+typedef boost::onullstream onullstream_type;
 #endif
+
 using boost::test_tools::output_test_stream;
 using namespace boost::unit_test;
 
@@ -39,13 +43,8 @@ using namespace boost::unit_test;
 
 void good_foo() {}
 void bad_foo()  { 
-#if !defined ( __GNUC__ ) || __GNUC__ > 2
-    boost::onullstream null_stream;
-#else
-    output_test_stream null_stream;
-#endif
-
-    unit_test_log.set_stream( null_stream );
+    onullstream_type null_out;
+    unit_test_log.set_stream( null_out );
     BOOST_ERROR( "Sure" );
     unit_test_log.set_stream( std::cout );
 }
@@ -150,6 +149,9 @@ test_main( int argc, char* argv[] )
 //  Revision History :
 //  
 //  $Log$
+//  Revision 1.19  2005/01/31 20:03:28  rogeeff
+//  use BOOST_WORKAROUND
+//
 //  Revision 1.18  2005/01/30 03:35:55  rogeeff
 //  no message
 //
@@ -172,9 +174,6 @@ test_main( int argc, char* argv[] )
 //  class properties reworked
 //  namespace names shortened
 //
-//  Revision 1.12  2003/12/01 00:42:38  rogeeff
-//  prerelease cleaning
-//
 // ***************************************************************************
 
 // EOF
diff --git a/test/test_case_template_test.cpp b/test/test_case_template_test.cpp
index ba42b61a..3195c5ab 100644
--- a/test/test_case_template_test.cpp
+++ b/test/test_case_template_test.cpp
@@ -19,11 +19,12 @@
 #include <boost/test/test_case_template.hpp>
 #include <boost/test/unit_test_log.hpp>
 
-#if !defined ( __GNUC__ ) || __GNUC__ > 2
+#if BOOST_WORKAROUND(  __GNUC__, < 3 )
+#include <boost/test/output_test_stream.hpp>
+typedef boost::test_tools::output_test_stream onullstream_type;
+#else
 #include <boost/test/utils/nullstream.hpp>
 typedef boost::onullstream onullstream_type;
-#else
-typedef boost::test_tools::output_test_stream onullstream_type;
 #endif
 
 // BOOST
@@ -155,6 +156,9 @@ int test_main( int, char* [] )
 //  Revision History :
 //  
 //  $Log$
+//  Revision 1.12  2005/01/31 20:01:40  rogeeff
+//  use BOOST_WORKAROUND
+//
 //  Revision 1.11  2005/01/30 03:35:55  rogeeff
 //  no message
 //
diff --git a/test/token_iterator_test.cpp b/test/token_iterator_test.cpp
index a86bd0f9..2fa531d0 100644
--- a/test/token_iterator_test.cpp
+++ b/test/token_iterator_test.cpp
@@ -115,7 +115,7 @@ void test_range_token_iterator()
     char const* pattern = "a bc , cd";
     std::copy( pattern, pattern+9, std::back_inserter( l ) );
 
-#if !BOOST_WORKAROUND( __GNUC__, < 3 )
+#if !defined( __GNUC__ ) ||  ( __GNUC__ == 3 && __GNUC_MINOR__ != 2 ) || ( __GNUC__ > 3 )
     my_token_iterator tit( l.begin(), l.end() );
     char const* res[] = { "a", "bc", ",", "cd" };
 
@@ -195,6 +195,9 @@ init_unit_test_suite( int argc, char* argv[] )
 // History :
 //
 // $Log$
+// Revision 1.8  2005/01/31 20:01:40  rogeeff
+// use BOOST_WORKAROUND
+//
 // Revision 1.7  2005/01/30 03:35:55  rogeeff
 // no message
 //