patch 8.2.0814: clang warning for implicit conversion

Problem:    Clang warning for implicit conversion.
Solution:   Add type cast. (Dominique Pelle, closes #6124)

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 37cb72f7ee4d95aa14f7d76205c3a046d111aeee..11452ce07823fb999e97a993d72ac2036b526322 100644 (file)
--- 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 ce0bc486da7f6e4370aa1ed3a0e959ee07e33bc0..34852c3699bfff88c64e2ba617ca9df915695967 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    814,
 /**/
     813,
 /**/