diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-05-23 19:30:05 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-05-23 19:30:05 +0200 |
| commit | 3718427ba3c28ccab30726880389e44070640d3b (patch) | |
| tree | f58632084caa58bb05bee32b8193f3db3adca680 | |
| parent | 591cec8366e87a172495c362477cbf5de8d399f0 (diff) | |
| download | vim-git-3718427ba3c28ccab30726880389e44070640d3b.tar.gz | |
patch 8.2.0814: clang warning for implicit conversionv8.2.0814
Problem: Clang warning for implicit conversion.
Solution: Add type cast. (Dominique Pelle, closes #6124)
| -rw-r--r-- | src/evalfunc.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 37cb72f7e..11452ce07 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -2603,9 +2603,9 @@ f_float2nr(typval_T *argvars, typval_T *rettv) 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; - else if (f >= VARNUM_MAX - DBL_EPSILON) + else if (f >= (float_T)VARNUM_MAX - DBL_EPSILON) rettv->vval.v_number = VARNUM_MAX; else rettv->vval.v_number = (varnumber_T)f; diff --git a/src/version.c b/src/version.c index ce0bc486d..34852c369 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 814, +/**/ 813, /**/ 812, |