From 4f1350ba02e93a90b1d515fa6afa1e4c2d494aea Mon Sep 17 00:00:00 2001
From: nobody <nobody@localhost>
Date: Thu, 7 Jun 2007 20:53:46 +0000
Subject: [PATCH] This commit was manufactured by cvs2svn to create tag
 'merged_to_RC_1_34_0'.

[SVN r37938]
---
 include/boost/algorithm/string/compare.hpp               | 6 +++---
 include/boost/algorithm/string/detail/case_conv.hpp      | 4 ++--
 include/boost/algorithm/string/detail/classification.hpp | 2 +-
 string/index.html                                        | 9 +++++++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/include/boost/algorithm/string/compare.hpp b/include/boost/algorithm/string/compare.hpp
index c2a0bba..bb15c80 100644
--- a/include/boost/algorithm/string/compare.hpp
+++ b/include/boost/algorithm/string/compare.hpp
@@ -67,7 +67,7 @@ namespace boost {
                 #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
                     return std::toupper(Arg1)==std::toupper(Arg2);
                 #else
-                    return std::toupper<T1>(Arg1,m_Loc)==std::toupper<T2>(Arg2,m_Loc);
+                    return std::toupper(Arg1,m_Loc)==std::toupper(Arg2,m_Loc);
                 #endif
             }
 
@@ -120,7 +120,7 @@ namespace boost {
                 #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
                     return std::toupper(Arg1)<std::toupper(Arg2);
                 #else
-                    return std::toupper<T1>(Arg1,m_Loc)<std::toupper<T2>(Arg2,m_Loc);
+                    return std::toupper(Arg1,m_Loc)<std::toupper(Arg2,m_Loc);
                 #endif
             }
 
@@ -173,7 +173,7 @@ namespace boost {
                 #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
                     return std::toupper(Arg1)<=std::toupper(Arg2);
                 #else
-                    return std::toupper<T1>(Arg1,m_Loc)<=std::toupper<T2>(Arg2,m_Loc);
+                    return std::toupper(Arg1,m_Loc)<=std::toupper(Arg2,m_Loc);
                 #endif
             }
 
diff --git a/include/boost/algorithm/string/detail/case_conv.hpp b/include/boost/algorithm/string/detail/case_conv.hpp
index ffc4514..95f9d85 100644
--- a/include/boost/algorithm/string/detail/case_conv.hpp
+++ b/include/boost/algorithm/string/detail/case_conv.hpp
@@ -33,7 +33,7 @@ namespace boost {
                     #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
                         return std::tolower( Ch);
                     #else
-                        return std::tolower<CharT>( Ch, m_Loc );
+                        return std::tolower( Ch, m_Loc );
                     #endif
                 }
             private:
@@ -53,7 +53,7 @@ namespace boost {
                     #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
                         return std::toupper( Ch);
                     #else
-                        return std::toupper<CharT>( Ch, m_Loc );
+                        return std::toupper( Ch, m_Loc );
                     #endif
                 }
             private:
diff --git a/include/boost/algorithm/string/detail/classification.hpp b/include/boost/algorithm/string/detail/classification.hpp
index c950bfa..3e305c3 100644
--- a/include/boost/algorithm/string/detail/classification.hpp
+++ b/include/boost/algorithm/string/detail/classification.hpp
@@ -46,7 +46,7 @@ namespace boost {
                     return std::use_facet< std::ctype<CharT> >(m_Locale).is( m_Type, Ch );
                 }
 
-                #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x582) && !defined(_USE_OLD_RW_STL)
+                #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
                     template<>
                     bool operator()( char const Ch ) const
                     {
diff --git a/string/index.html b/string/index.html
index 717d7cf..dc0e1b9 100644
--- a/string/index.html
+++ b/string/index.html
@@ -4,6 +4,11 @@
 </head>
 <body>
 Automatic redirection failed, please go to
-<a href="../../../doc/html/string_algo.html">../../doc/html/string_algo.html</a>
+<a href="../../../doc/html/string_algo.html">../../doc/html/string_algo.html</a> 
+&nbsp;<hr>
+<p>© Copyright Beman Dawes, 2001</p>
+<p>Distributed under the Boost Software License, Version 1.0. (See accompanying 
+file <a href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or copy 
+at <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</p>
 </body>
-</html>
+</html>
\ No newline at end of file