libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 15:21:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMMON: Changed Array::resize to not shrink the internal storage if we shrink the array

Browse Source 
svn-id: r40262
This commit is contained in:
Max Horn 2009-05-03 09:00:53 +00:00
parent c379927d3a
commit 4d57c1f9a9
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/array.h
View File

@ -30,6 +30,12 @@
namespace Common {
// TODO: Improve the storage management of this class.
// In particular, don't use new[] and delete[], but rather
// construct/destruct objects manually. This way, we can
// ensure that storage which is not currently used does not
// correspond to a live active object.
// (This is only of interest for array of non-POD objects).
template<class T>
class Array {
protected:
@ -196,18 +202,7 @@ public:
}
void resize(uint newSize) {
if (newSize == _size)
return;
T *old_storage = _storage;
_capacity = newSize;
_storage = new T[newSize];
if (old_storage) {
// Copy old data
int cnt = (_size < newSize ? _size : newSize);
copy(old_storage, old_storage + cnt, _storage);
delete[] old_storage;
}
reserve(newSize);
_size = newSize;
}