feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Fix some C++14 ism's.

Browse Source
This commit is contained in:
jzmaddock
2020-12-13 18:14:50 +00:00
parent 1d980dd796
commit bb2346519c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/regex/v4/icu.hpp
View File

@ -82,16 +82,16 @@ namespace boost {
::uint8_t result[100]; ::uint8_t result[100];
::int32_t len; ::int32_t len;
if (!t.empty()) if (!t.empty())
len = pcoll->getSortKey(&*t.begin(), static_cast<::int32_t>(t.size()), result, sizeof(result)); len = pcoll->getSortKey(&*t.begin(), static_cast< ::int32_t>(t.size()), result, sizeof(result));
else else
len = pcoll->getSortKey(static_cast<UChar const*>(0), static_cast<::int32_t>(0), result, sizeof(result)); len = pcoll->getSortKey(static_cast<UChar const*>(0), static_cast< ::int32_t>(0), result, sizeof(result));
if (std::size_t(len) > sizeof(result)) if (std::size_t(len) > sizeof(result))
{ {
scoped_array< ::uint8_t> presult(new ::uint8_t[len + 1]); scoped_array< ::uint8_t> presult(new ::uint8_t[len + 1]);
if (!t.empty()) if (!t.empty())
len = pcoll->getSortKey(&*t.begin(), static_cast<::int32_t>(t.size()), presult.get(), len + 1); len = pcoll->getSortKey(&*t.begin(), static_cast< ::int32_t>(t.size()), presult.get(), len + 1);
else else
len = pcoll->getSortKey(static_cast<UChar const*>(0), static_cast<::int32_t>(0), presult.get(), len + 1); len = pcoll->getSortKey(static_cast<UChar const*>(0), static_cast< ::int32_t>(0), presult.get(), len + 1);
if ((0 == presult[len - 1]) && (len > 1)) if ((0 == presult[len - 1]) && (len > 1))
--len; --len;
#ifndef BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS #ifndef BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS
@ -374,7 +374,7 @@ namespace boost {
} }
int value(char_type c, int radix)const int value(char_type c, int radix)const
{ {
return u_digit(c, static_cast<::int8_t>(radix)); return u_digit(c, static_cast< ::int8_t>(radix));
} }
locale_type imbue(locale_type l) locale_type imbue(locale_type l)
{ {