diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-01-12 18:25:02 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-01-26 10:37:46 +0000 |
| commit | 9891ee5a2aadd2672d8d7f6b217e852344ff86eb (patch) | |
| tree | 2f5950ed243a10e36e1d8b9609c6426946fe9011 /strings/ctype-uca.c | |
| parent | 859d100d70a9dba222b229bbc0d5a01194e8ed5f (diff) | |
| download | mariadb-git-9891ee5a2aadd2672d8d7f6b217e852344ff86eb.tar.gz | |
Fix and reenable Windows compiler warning C4800 (size_t conversion).
Diffstat (limited to 'strings/ctype-uca.c')
| -rw-r--r-- | strings/ctype-uca.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index e3ed531df93..f75b5c7c7a4 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -31260,7 +31260,7 @@ static my_bool my_uca_alloc_contractions(MY_CONTRACTIONS *contractions, MY_CHARSET_LOADER *loader, size_t n) { - uint size= n * sizeof(MY_CONTRACTION); + size_t size= n * sizeof(MY_CONTRACTION); if (!(contractions->item= (loader->once_alloc)(size)) || !(contractions->flags= (char *) (loader->once_alloc)(MY_UCA_CNT_FLAG_SIZE))) return 1; @@ -34005,7 +34005,7 @@ apply_one_rule(MY_CHARSET_LOADER *loader, { MY_CONTRACTIONS *contractions= &dst->contractions; to= my_uca_init_one_contraction(contractions, - r->curr, nshift, r->with_context); + r->curr, (uint)nshift, r->with_context); /* Store weights of the "reset to" character */ dst->contractions.nitems--; /* Temporarily hide - it's incomplete */ rc= my_char_weight_put(dst, @@ -34202,9 +34202,9 @@ init_weight_level(MY_CHARSET_LOADER *loader, MY_COLL_RULES *rules, ncontractions++; } - ncontractions += src->contractions.nitems; + ncontractions += (int)src->contractions.nitems; - if ((my_uca_generate_pages(loader, dst, src, npages))) + if ((my_uca_generate_pages(loader, dst, src, (uint)npages))) return TRUE; if (ncontractions) |