In perl.git, the branch smoke-me/khw-locale has been updated <https://perl5.git.perl.org/perl.git/commitdiff/d4d54efa06c242869cd0940cd096005f68565266?hp=ff43f5578ec2bd35a0f22877390167d5184dc6bb>
- Log ----------------------------------------------------------------- commit d4d54efa06c242869cd0940cd096005f68565266 Author: Karl Williamson <[email protected]> Date: Wed Apr 3 14:30:02 2019 -0600 XXX silence MS compiler warnings ----------------------------------------------------------------------- Summary of changes: handy.h | 2 +- numeric.c | 2 +- regcomp.c | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/handy.h b/handy.h index edc01075d5..a5e2c6b442 100644 --- a/handy.h +++ b/handy.h @@ -1508,7 +1508,7 @@ END_EXTERN_C /* Use table lookup for speed; returns the input itself if is out-of-range */ #define toLOWER_LATIN1(c) ((! FITS_IN_8_BITS(c)) \ - ? (c) \ + ? (U8) (c) \ : PL_latin1_lc[ (U8) (c) ]) #define toLOWER_L1(c) toLOWER_LATIN1(c) /* Synonym for consistency */ diff --git a/numeric.c b/numeric.c index 710653053f..9ccb808a4a 100644 --- a/numeric.c +++ b/numeric.c @@ -1402,7 +1402,7 @@ Perl_my_atof2(pTHX_ const char* orig, NV* value) } char* -Perl_my_atof3(pTHX_ const char* orig, NV* value, STRLEN len) +Perl_my_atof3(pTHX_ const char* orig, NV* value, const STRLEN len) { const char* s = orig; NV result[3] = {0.0, 0.0, 0.0}; diff --git a/regcomp.c b/regcomp.c index f040a35210..6b6b906afa 100644 --- a/regcomp.c +++ b/regcomp.c @@ -11054,8 +11054,8 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp, U32 depth) if (!SvIOK(max_open)) { sv_setiv(max_open, RE_COMPILE_RECURSION_INIT); } - if (depth > 4 * SvIV(max_open)) { /* We increase depth by 4 for each open - paren */ + if (depth > 4 * (UV) SvIV(max_open)) { /* We increase depth by 4 for each + open paren */ vFAIL("Too many nested open parens"); } @@ -12883,9 +12883,9 @@ S_grok_bslash_N(pTHX_ RExC_state_t *pRExC_state, value = (U8 *) SvPV(value_sv, value_len); /* See if the result is one code point vs 0 or multiple */ - if (value_len > 0 && value_len <= ((SvUTF8(value_sv)) - ? UTF8SKIP(value) - : 1)) + if (value_len > 0 && value_len <= (UV) ((SvUTF8(value_sv)) + ? UTF8SKIP(value) + : 1)) { /* Here, exactly one code point. If that isn't what is wanted, * fail */ @@ -14727,7 +14727,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth) RExC_emit += STR_SZ(len); /* If the node isn't a single character, it can't be SIMPLE */ - if (len > ((UTF) ? UVCHR_SKIP(ender) : 1)) { + if (len > (Sizet) ((UTF) ? UVCHR_SKIP(ender) : 1)) { maybe_SIMPLE = 0; } @@ -18742,7 +18742,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth, RExC_emit += 1 + STR_SZ(len); STR_LEN(REGNODE_p(ret)) = len; if (len == 1) { - *STRING(REGNODE_p(ret)) = value; + *STRING(REGNODE_p(ret)) = (U8) value; } else { uvchr_to_utf8((U8 *) STRING(REGNODE_p(ret)), value); -- Perl5 Master Repository
