diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-07 19:35:25 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-07 19:35:25 (GMT) |
| commit | 630bd308da24e83f5e8cbedb917a05fc68072b19 (patch) | |
| tree | 11522e2d39cd54abe468a581986e6fdd6195460f /generic/tclInt.h | |
| parent | fb50a7f7b52d70cb9a3f8b0225a988d5c83e92ef (diff) | |
| parent | 495791db7a0a519703a2cb0f1f0f6304a303bb8d (diff) | |
| download | tcl-630bd308da24e83f5e8cbedb917a05fc68072b19.zip tcl-630bd308da24e83f5e8cbedb917a05fc68072b19.tar.gz tcl-630bd308da24e83f5e8cbedb917a05fc68072b19.tar.bz2 | |
Merge 8.7. This makes disabling Microsoft warning C4307 no longer necessary: It appears this warning was good for something after all.
Diffstat (limited to 'generic/tclInt.h')
| -rw-r--r-- | generic/tclInt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h index f3ccd46..4d2573d 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -2460,7 +2460,7 @@ typedef struct List { : Tcl_GetIntFromObj((interp), (objPtr), (intPtr))) #define TclGetIntForIndexM(interp, objPtr, endValue, idxPtr) \ ((((objPtr)->typePtr == &tclIntType) && ((objPtr)->internalRep.wideValue >= 0) \ - && ((Tcl_WideUInt)(objPtr)->internalRep.wideValue <= (Tcl_WideUInt)(endValue + 1))) \ + && ((Tcl_WideUInt)(objPtr)->internalRep.wideValue <= (size_t)(endValue) + 1)) \ ? ((*(idxPtr) = (size_t)(objPtr)->internalRep.wideValue), TCL_OK) \ : Tcl_GetIntForIndex((interp), (objPtr), (endValue), (idxPtr))) |