thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.0814: clang warning for implicit conversion

Browse Source 
Problem:    Clang warning for implicit conversion.
Solution:   Add type cast. (Dominique Pelle, closes #6124)
This commit is contained in:
Bram Moolenaar
2020-05-23 19:30:05 +02:00
parent 591cec8366
commit 3718427ba3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/evalfunc.c
View File

@@ -2603,9 +2603,9 @@ f_float2nr(typval_T *argvars, typval_T *rettv)
if (get_float_arg(argvars, &f) == OK) if (get_float_arg(argvars, &f) == OK)
{ {
if (f <= -VARNUM_MAX + DBL_EPSILON) if (f <= (float_T)-VARNUM_MAX + DBL_EPSILON)
rettv->vval.v_number = -VARNUM_MAX; rettv->vval.v_number = -VARNUM_MAX;
else if (f >= VARNUM_MAX - DBL_EPSILON) else if (f >= (float_T)VARNUM_MAX - DBL_EPSILON)
rettv->vval.v_number = VARNUM_MAX; rettv->vval.v_number = VARNUM_MAX;
else else
rettv->vval.v_number = (varnumber_T)f; rettv->vval.v_number = (varnumber_T)f;

2
src/version.c
View File

@@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
814,
/**/ /**/
813, 813,
/**/ /**/