| Message ID | 20211126113614.709-5-philipoakley@iee.email (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Fix LLP64 `(size_t)1` compatibility VS C4334 warnings | expand |
diff --git a/object-file.c b/object-file.c index c3d866a287..da8821cb91 100644 --- a/object-file.c +++ b/object-file.c @@ -2425,7 +2425,7 @@ struct oidtree *odb_loose_cache(struct object_directory *odb, struct strbuf buf = STRBUF_INIT; size_t word_bits = bitsizeof(odb->loose_objects_subdir_seen[0]); size_t word_index = subdir_nr / word_bits; - size_t mask = 1u << (subdir_nr % word_bits); + size_t mask = (size_t)1u << (subdir_nr % word_bits); uint32_t *bitmap; if (subdir_nr < 0 ||
Visual Studio reports C4334 "was 64-bit shift intended" warning because of size miss-match. Promote unity to the matching type to fit with the assignment. Signed-off-by: Philip Oakley <philipoakley@iee.email> --- This cannot be applied to the maint-2.32 branch as the earlier René Scharfe patch had been, because the original sha1-file.c, to which the backport would apply, has been renamed in e5afd4449d (object-file.c: rename from sha1-file.c, 2020-12-31) which was merged in 8b327f1784 (Merge branch 'ma/sha1-is-a-hash', 2021-01-15) --- object-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)