From 91ce1ccd81e3cbfcd93db2951651c9fb2741e29f Mon Sep 17 00:00:00 2001
From: Aleksey Gurtovoy <agurtovoy@meta-comm.com>
Date: Sun, 28 Nov 2004 04:44:21 +0000
Subject: [PATCH] merge RC_1_32_0 fixes

[SVN r26333]
---
 test/basic_cstring_test.cpp  | 12 ++++++++++--
 test/token_iterator_test.cpp | 10 ++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/test/basic_cstring_test.cpp b/test/basic_cstring_test.cpp
index 6e1cb483..7f49ea78 100644
--- a/test/basic_cstring_test.cpp
+++ b/test/basic_cstring_test.cpp
@@ -159,6 +159,7 @@ BOOST_META_FUNC_TEST_CASE( constructors_std_string_test );
 
 void array_construction_test()
 {
+#if !BOOST_WORKAROUND(__BORLANDC__, < 0x600)
     const_string bcs_array[] = { "str1", "str2" };
 
     BOOST_CHECK_EQUAL( const_string::traits_type::compare( bcs_array[0].begin(), "str1", bcs_array[0].size() ), 0 );
@@ -166,6 +167,7 @@ void array_construction_test()
 
     const_string bcs( "abc" );
     BOOST_CHECK_EQUAL( const_string::traits_type::compare( bcs.begin(), "abc", bcs.size() ), 0 );
+#endif
 }
 
 //____________________________________________________________________________//
@@ -317,14 +319,14 @@ void comparison_std_string_test( CharT* = 0 )
     typename utf::basic_cstring<CharT>::std_string l( TEST_STRING );
 
     BOOST_CHECK( bcs1 == l );
-#if BOOST_WORKAROUND(BOOST_MSVC, > 1200)
+#if BOOST_WORKAROUND(BOOST_MSVC, > 1300)
     BOOST_CHECK( l == bcs1 );
 #endif
 
     bcs1.resize( 4 );
 
     BOOST_CHECK( bcs1 != l );
-#if BOOST_WORKAROUND(BOOST_MSVC, > 1200)
+#if BOOST_WORKAROUND(BOOST_MSVC, > 1300)
     BOOST_CHECK( l != bcs1 );
 #endif
 }
@@ -505,6 +507,12 @@ init_unit_test_suite( int /*argc*/, char* /*argv*/[] )
 // History :
 //
 // $Log$
+// Revision 1.8  2004/11/28 04:28:56  agurtovoy
+// merge RC_1_32_0 fixes
+//
+// Revision 1.7.2.1  2004/10/30 11:33:38  agurtovoy
+// MSVC/Borland fixes
+//
 // Revision 1.7  2004/10/01 10:55:43  rogeeff
 // some test errors workarrounds
 //
diff --git a/test/token_iterator_test.cpp b/test/token_iterator_test.cpp
index 0a8fa0c7..67d8f70a 100644
--- a/test/token_iterator_test.cpp
+++ b/test/token_iterator_test.cpp
@@ -113,7 +113,7 @@ void test_range_token_iterator()
     char const* pattern = "a bc , cd";
     std::copy( pattern, pattern+9, std::back_inserter( l ) );
 
-#if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) && !BOOST_WORKAROUND( __GNUC__, < 3 )
+#if !BOOST_WORKAROUND( __GNUC__, < 3 )
     my_token_iterator tit( l.begin(), l.end() );
     char const* res[] = { "a", "bc", ",", "cd" };
 
@@ -161,7 +161,7 @@ void test_make_range_token_iterator()
 {
     char const* str = "Abc22sdf sd2fg ";
 
-#if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) && !BOOST_WORKAROUND( __BORLANDC__, <= 0x550 )
+#if !BOOST_WORKAROUND( BOOST_MSVC, <= 1300 ) && !BOOST_WORKAROUND( __BORLANDC__, <= 0x550 )
     foo( boost::make_transform_iterator( str, loo ),
          boost::make_transform_iterator( str+15, loo ) );
 #endif
@@ -193,6 +193,12 @@ init_unit_test_suite( int argc, char* argv[] )
 // History :
 //
 // $Log$
+// Revision 1.6  2004/11/28 04:28:59  agurtovoy
+// merge RC_1_32_0 fixes
+//
+// Revision 1.5.2.1  2004/10/30 11:33:38  agurtovoy
+// MSVC/Borland fixes
+//
 // Revision 1.5  2004/10/05 01:32:09  rogeeff
 // file/directory renaming for the sake of CD burning
 //