root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corretto check nella remove

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@2045 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1995-10-30 13:40:34 +00:00
parent 658d370f05
commit f8f0a320f9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/array.cpp
View File

@ -266,7 +266,7 @@ TObject* TArray::remove(
// @rdesc Ritorna l'elemento dell'array eliminato senza farne la delete // @rdesc Ritorna l'elemento dell'array eliminato senza farne la delete
{ {
CHECKD(index >= 0 && index < _size, "Can't remove array item ", index); CHECKD(index >= 0, "Can't remove array item ", index);
TObject* o = objptr(index); TObject* o = objptr(index);
if (o) if (o)
@ -276,9 +276,9 @@ TObject* TArray::remove(
if (index < _next) if (index < _next)
_next = index; _next = index;
} }
if (dopack) if (dopack && index < size())
{ {
const int last = _size-1; const int last = size()-1;
for (int i = index ; i < last; i++) for (int i = index ; i < last; i++)
_data[i] = _data[i+1]; _data[i] = _data[i+1];
_data[last] = NULL; _data[last] = NULL;