github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-24 06:12:52 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.cosmetics

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@9290 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-12-15 07:50:03 +00:00
parent e9a75eef5f
commit e7069aa693
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
uppsrc/Core/Vcont.cpp
View file

@ -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
}