From e7069aa693a3a1854caf7ef2424fb57718ca97da Mon Sep 17 00:00:00 2001 From: cxl Date: Tue, 15 Dec 2015 07:50:03 +0000 Subject: [PATCH] .cosmetics git-svn-id: svn://ultimatepp.org/upp/trunk@9290 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/Vcont.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/uppsrc/Core/Vcont.cpp b/uppsrc/Core/Vcont.cpp index bd901633b..e737f2ec8 100644 --- a/uppsrc/Core/Vcont.cpp +++ b/uppsrc/Core/Vcont.cpp @@ -33,7 +33,8 @@ void VectorReAlloc_(void *v_, int newalloc, int sizeofT) size_t sz0 = (size_t)newalloc * sizeofT; size_t sz = sz0; void *newvector = newalloc ? MemoryAllocSz(sz) : NULL; - v->alloc = newalloc == INT_MAX ? INT_MAX : (int)((sz - sz0) / sizeofT + newalloc); + v->alloc = newalloc == INT_MAX ? INT_MAX // maximum alloc reached + : (int)((sz - sz0) / sizeofT + newalloc); // adjust alloc to real memory size if(v->vector) memcpy(newvector, v->vector, (size_t)v->items * sizeofT); v->vector = newvector; @@ -56,8 +57,6 @@ void VectorGrow_(void *v_, int sizeofT) VectorReAlloc_(v, max(v->alloc + 1, v->alloc >= INT_MAX / 2 ? INT_MAX : 2 * v->alloc), sizeofT); #else VectorReAlloc_(v, max(v->alloc + 1, v->alloc >= int((int64)2 * INT_MAX / 3) ? INT_MAX : v->alloc + (v->alloc >> 1)), sizeofT); -// VectorReAlloc_(v, max(v->alloc + 1, max(2 * v->alloc, 16 / sizeofT)), sizeofT); -// VectorReAlloc_(v, max(v->alloc + 1, 2 * v->alloc), sizeofT); #endif }