aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2009-07-13 22:08:56 +0000
committerMax Horn2009-07-13 22:08:56 +0000
commit3ed4f388d7c3a8f162be2463cc12c4c52db88214 (patch)
tree9def8ca79754128402a1dfc5e932e8876f2c4447
parent51a9bfc9e2881aa7c7ddaa9cc6b2709acab5e725 (diff)
downloadscummvm-rg350-3ed4f388d7c3a8f162be2463cc12c4c52db88214.tar.gz
scummvm-rg350-3ed4f388d7c3a8f162be2463cc12c4c52db88214.tar.bz2
scummvm-rg350-3ed4f388d7c3a8f162be2463cc12c4c52db88214.zip
Unify PS2 and non-PS2 alloc code in Common::Array code (if this causes regressions somewhere, we better find a fix that also works on PS2)
svn-id: r42455
-rw-r--r--common/array.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/common/array.h b/common/array.h
index ac8a4b20d7..0b5a65e9bd 100644
--- a/common/array.h
+++ b/common/array.h
@@ -222,13 +222,7 @@ public:
T *old_storage = _storage;
_capacity = newCapacity;
- // PS2 gcc 3.2.2 can't do "new T[newCapacity]()" but only
- // "new T[newCapacity]" -> quick fix until we update tools.
- #ifndef __PLAYSTATION2__
- _storage = new T[newCapacity]();
- #else
_storage = new T[newCapacity];
- #endif
assert(_storage);
if (old_storage) {
@@ -279,13 +273,7 @@ protected:
// If there is not enough space, allocate more and
// copy old elements over.
uint newCapacity = roundUpCapacity(_size + n);
- // PS2 gcc 3.2.2 can't do "new T[newCapacity]()" but only
- // "new T[newCapacity]" -> quick fix until we update tools.
- #ifndef __PLAYSTATION2__
- newStorage = new T[newCapacity]();
- #else
newStorage = new T[newCapacity];
- #endif
assert(newStorage);
copy(_storage, _storage + idx, newStorage);
pos = newStorage + idx;