[Boost-commit] svn:boost r76522 - branches/release/boost/algorithm/string/detail

Subject: [Boost-commit] svn:boost r76522 - branches/release/boost/algorithm/string/detail
From: marshall_at_[hidden]
Date: 2012-01-15 11:05:56

Author: marshall
Date: 2012-01-15 11:05:55 EST (Sun, 15 Jan 2012)
New Revision: 76522
URL: http://svn.boost.org/trac/boost/changeset/76522

Log:
Merge changes to release; fixes #3634
Properties modified: 
   branches/release/boost/algorithm/string/detail/case_conv.hpp   (contents, props changed)
Text files modified: 
   branches/release/boost/algorithm/string/detail/case_conv.hpp |     6 ++++--                                  
   1 files changed, 4 insertions(+), 2 deletions(-)

Modified: branches/release/boost/algorithm/string/detail/case_conv.hpp
==============================================================================
--- branches/release/boost/algorithm/string/detail/case_conv.hpp	(original)
+++ branches/release/boost/algorithm/string/detail/case_conv.hpp	2012-01-15 11:05:55 EST (Sun, 15 Jan 2012)
@@ -15,6 +15,8 @@
 #include <locale>
 #include <functional>
 
+#include <boost/type_traits/make_unsigned.hpp>
+
 namespace boost {
     namespace algorithm {
         namespace detail {
@@ -37,7 +39,7 @@
                 CharT operator ()( CharT Ch ) const
                 {
                     #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
-                        return std::tolower( Ch);
+                        return std::tolower( static_cast<typename boost::make_unsigned <CharT>::type> ( Ch ));
                     #else
                         return std::tolower<CharT>( Ch, *m_Loc );
                     #endif
@@ -57,7 +59,7 @@
                 CharT operator ()( CharT Ch ) const
                 {
                     #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
-                        return std::toupper( Ch);
+                        return std::toupper( static_cast<typename boost::make_unsigned <CharT>::type> ( Ch ));
                     #else
                         return std::toupper<CharT>( Ch, *m_Loc );
                     #endif