diff options
Diffstat (limited to 'boost/property_tree/detail/json_parser_write.hpp')
| -rw-r--r-- | boost/property_tree/detail/json_parser_write.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/boost/property_tree/detail/json_parser_write.hpp b/boost/property_tree/detail/json_parser_write.hpp index b52c8eac6f..78dbfe4185 100644 --- a/boost/property_tree/detail/json_parser_write.hpp +++ b/boost/property_tree/detail/json_parser_write.hpp @@ -29,11 +29,13 @@ namespace boost { namespace property_tree { namespace json_parser typename std::basic_string<Ch>::const_iterator e = s.end(); while (b != e) { + typedef typename make_unsigned<Ch>::type UCh; + UCh c(*b); // This assumes an ASCII superset. But so does everything in PTree. // We escape everything outside ASCII, because this code can't // handle high unicode characters. - if (*b == 0x20 || *b == 0x21 || (*b >= 0x23 && *b <= 0x2E) || - (*b >= 0x30 && *b <= 0x5B) || (*b >= 0x5D && *b <= 0xFF)) + if (c == 0x20 || c == 0x21 || (c >= 0x23 && c <= 0x2E) || + (c >= 0x30 && c <= 0x5B) || (c >= 0x5D && c <= 0xFF)) result += *b; else if (*b == Ch('\b')) result += Ch('\\'), result += Ch('b'); else if (*b == Ch('\f')) result += Ch('\\'), result += Ch('f'); @@ -46,7 +48,6 @@ namespace boost { namespace property_tree { namespace json_parser else { const char *hexdigits = "0123456789ABCDEF"; - typedef typename make_unsigned<Ch>::type UCh; unsigned long u = (std::min)(static_cast<unsigned long>( static_cast<UCh>(*b)), 0xFFFFul); |