Merge changes to release; fixes #3634

[SVN r76522]
This commit is contained in:
Marshall Clow
2012-01-15 16:05:55 +00:00
parent be9da63894
commit 044d667e79

View File

@ -15,6 +15,8 @@
#include <locale> #include <locale>
#include <functional> #include <functional>
#include <boost/type_traits/make_unsigned.hpp>
namespace boost { namespace boost {
namespace algorithm { namespace algorithm {
namespace detail { namespace detail {
@ -37,7 +39,7 @@ namespace boost {
CharT operator ()( CharT Ch ) const CharT operator ()( CharT Ch ) const
{ {
#if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL) #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 #else
return std::tolower<CharT>( Ch, *m_Loc ); return std::tolower<CharT>( Ch, *m_Loc );
#endif #endif
@ -57,7 +59,7 @@ namespace boost {
CharT operator ()( CharT Ch ) const CharT operator ()( CharT Ch ) const
{ {
#if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL) #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 #else
return std::toupper<CharT>( Ch, *m_Loc ); return std::toupper<CharT>( Ch, *m_Loc );
#endif #endif