diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-14 01:34:30 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-14 01:35:22 +0400 |
| commit | 7e205836884e892995105518791ab49816da37ef (patch) | |
| tree | 14065139e0f1f57da9ecabdddaf24320ead6e5f6 /intern/guardedalloc | |
| parent | 6cd595424679c8c29848c797d079cfd7c7b73d6d (diff) | |
Attempt to fix sign conversion error happening on buildbot
Diffstat (limited to 'intern/guardedalloc')
| -rw-r--r-- | intern/guardedalloc/intern/mallocn_guarded_impl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/guardedalloc/intern/mallocn_guarded_impl.c b/intern/guardedalloc/intern/mallocn_guarded_impl.c index 206390e0710..6e32844e2e7 100644 --- a/intern/guardedalloc/intern/mallocn_guarded_impl.c +++ b/intern/guardedalloc/intern/mallocn_guarded_impl.c @@ -548,7 +548,7 @@ void *MEM_guarded_mallocN_aligned(size_t len, size_t alignment, const char *str) * We only support small alignments which fits into short in * order to save some bits in MemHead structure. */ - short extra_padding = (short)MEMHEAD_ALIGN_PADDING(alignment); + size_t extra_padding = MEMHEAD_ALIGN_PADDING(alignment); /* Huge alignment values doesn't make sense and they * wouldn't fit into 'short' used in the MemHead. @@ -560,7 +560,7 @@ void *MEM_guarded_mallocN_aligned(size_t len, size_t alignment, const char *str) len = SIZET_ALIGN_4(len); - memh = (MemHead *)aligned_malloc(len + (size_t)extra_padding + sizeof(MemHead) + sizeof(MemTail), alignment); + memh = (MemHead *)aligned_malloc(len + extra_padding + sizeof(MemHead) + sizeof(MemTail), alignment); if (LIKELY(memh)) { /* We keep padding in the beginning of MemHead, |