[boost] [algorithm/string] Patch for BCB2006

From: Nicola Musatti (Nicola.Musatti_at_[hidden])
Date: 2006-04-08 04:03:46

Hallo,
the enclosed patch brings support for the latest Borland compiler to the 
same level as bcc 5.6.4 . I tested it against bcc 5.8.2, bcc 5.6.4, VC++ 
8.0 and g++ 3.4.2 .

Cheers,
Nicola Musatti


******Index: compare.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/algorithm/string/compare.hpp,v
retrieving revision 1.6
diff -d -u -r1.6 compare.hpp
--- compare.hpp	6 Mar 2006 18:05:10 -0000	1.6
+++ compare.hpp	8 Apr 2006 07:41:10 -0000
@@ -67,7 +67,7 @@
                 #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
                     return std::toupper(Arg1)==std::toupper(Arg2);
                 #else
-                    return std::toupper(Arg1,m_Loc)==std::toupper(Arg2,m_Loc);
+                    return std::toupper<T1>(Arg1,m_Loc)==std::toupper<T2>(Arg2,m_Loc);
                 #endif
             }
 
@@ -120,7 +120,7 @@
                 #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
                     return std::toupper(Arg1)<std::toupper(Arg2);
                 #else
-                    return std::toupper(Arg1,m_Loc)<std::toupper(Arg2,m_Loc);
+                    return std::toupper<T1>(Arg1,m_Loc)<std::toupper<T2>(Arg2,m_Loc);
                 #endif
             }
 
@@ -173,7 +173,7 @@
                 #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
                     return std::toupper(Arg1)<=std::toupper(Arg2);
                 #else
-                    return std::toupper(Arg1,m_Loc)<=std::toupper(Arg2,m_Loc);
+                    return std::toupper<T1>(Arg1,m_Loc)<=std::toupper<T2>(Arg2,m_Loc);
                 #endif
             }
 
Index: detail/case_conv.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/algorithm/string/detail/case_conv.hpp,v
retrieving revision 1.2
diff -d -u -r1.2 case_conv.hpp
--- detail/case_conv.hpp	11 May 2005 09:17:14 -0000	1.2
+++ detail/case_conv.hpp	8 Apr 2006 07:35:10 -0000
@@ -33,7 +33,7 @@
                     #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
                         return std::tolower( Ch);
                     #else
-                        return std::tolower( Ch, m_Loc );
+                        return std::tolower<CharT>( Ch, m_Loc );
                     #endif
                 }
             private:
@@ -53,7 +53,7 @@
                     #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
                         return std::toupper( Ch);
                     #else
-                        return std::toupper( Ch, m_Loc );
+                        return std::toupper<CharT>( Ch, m_Loc );
                     #endif
                 }
             private:
Index: detail/classification.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/algorithm/string/detail/classification.hpp,v
retrieving revision 1.7
diff -d -u -r1.7 classification.hpp
--- detail/classification.hpp	11 May 2005 09:17:14 -0000	1.7
+++ detail/classification.hpp	7 Apr 2006 07:45:49 -0000
@@ -46,7 +46,7 @@
                     return std::use_facet< std::ctype<CharT> >(m_Locale).is( m_Type, Ch );
                 }
 
-                #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
+                #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x582) && !defined(_USE_OLD_RW_STL)
                     template<>
                     bool operator()( char const Ch ) const
                     {