|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r66855 - branches/release/boost
From: marshall_at_[hidden]
Date: 2010-11-29 16:17:52
Author: marshall
Date: 2010-11-29 16:17:48 EST (Mon, 29 Nov 2010)
New Revision: 66855
URL: http://svn.boost.org/trac/boost/changeset/66855
Log:
Merge patch to release; fixes #4791
Properties modified:
branches/release/boost/token_functions.hpp (contents, props changed)
Text files modified:
branches/release/boost/token_functions.hpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
Modified: branches/release/boost/token_functions.hpp
==============================================================================
--- branches/release/boost/token_functions.hpp (original)
+++ branches/release/boost/token_functions.hpp 2010-11-29 16:17:48 EST (Mon, 29 Nov 2010)
@@ -218,9 +218,9 @@
{
#if !defined(BOOST_NO_CWCTYPE)
if (sizeof(char_type) == 1)
- return std::isspace(c) != 0;
+ return std::isspace(static_cast<int>(c)) != 0;
else
- return std::iswspace(c) != 0;
+ return std::iswspace(static_cast<std::wint_t>(c)) != 0;
#else
return static_cast< unsigned >(c) <= 255 && std::isspace(c) != 0;
#endif
@@ -230,9 +230,9 @@
{
#if !defined(BOOST_NO_CWCTYPE)
if (sizeof(char_type) == 1)
- return std::ispunct(c) != 0;
+ return std::ispunct(static_cast<int>(c)) != 0;
else
- return std::iswpunct(c) != 0;
+ return std::iswpunct(static_cast<std::wint_t>(c)) != 0;
#else
return static_cast< unsigned >(c) <= 255 && std::ispunct(c) != 0;
#endif
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk