changeset 20520:70986f70880a v8.2.0814

patch 8.2.0814: clang warning for implicit conversion Commit: https://github.com/vim/vim/commit/3718427ba3c28ccab30726880389e44070640d3b Author: Bram Moolenaar <Bram@vim.org> Date: Sat May 23 19:30:05 2020 +0200 patch 8.2.0814: clang warning for implicit conversion Problem: Clang warning for implicit conversion. Solution: Add type cast. (Dominique Pelle, closes https://github.com/vim/vim/issues/6124)
author Bram Moolenaar <Bram@vim.org>
date Sat, 23 May 2020 19:45:04 +0200
parents 67cb8ce334eb
children fb1d6f728a72
files src/evalfunc.c src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -2603,9 +2603,9 @@ f_float2nr(typval_T *argvars, typval_T *
 
     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;
--- 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,