@@ -82,13 +82,13 @@ - addItem: (void*)item { if (SIZE_MAX - count < 1) @throw [OFOutOfRangeException newWithClass: isa]; - data = [self resizeMem: data - toNItems: count + 1 - withSize: itemsize]; + data = [self resizeMemory: data + toNItems: count + 1 + withSize: itemsize]; memcpy(data + count++ * itemsize, item, itemsize); return self; } @@ -97,13 +97,13 @@ fromCArray: (void*)carray { if (nitems > SIZE_MAX - count) @throw [OFOutOfRangeException newWithClass: isa]; - data = [self resizeMem: data - toNItems: count + nitems - withSize: itemsize]; + data = [self resizeMemory: data + toNItems: count + nitems + withSize: itemsize]; memcpy(data + count * itemsize, carray, nitems * itemsize); count += nitems; return self; @@ -112,13 +112,13 @@ - removeNItems: (size_t)nitems { if (nitems > count) @throw [OFOutOfRangeException newWithClass: isa]; - data = [self resizeMem: data - toNItems: count - nitems - withSize: itemsize]; + data = [self resizeMemory: data + toNItems: count - nitems + withSize: itemsize]; count -= nitems; return self; } @@ -213,12 +213,12 @@ @throw [OFOutOfRangeException newWithClass: isa]; nsize = ((count + 1) * itemsize + lastpagebyte) & ~lastpagebyte; if (size != nsize) - data = [self resizeMem: data - toSize: nsize]; + data = [self resizeMemory: data + toSize: nsize]; memcpy(data + count++ * itemsize, item, itemsize); size = nsize; return self; @@ -233,12 +233,12 @@ @throw [OFOutOfRangeException newWithClass: isa]; nsize = ((count + nitems) * itemsize + lastpagebyte) & ~lastpagebyte; if (size != nsize) - data = [self resizeMem: data - toSize: nsize]; + data = [self resizeMemory: data + toSize: nsize]; memcpy(data + count * itemsize, carray, nitems * itemsize); count += nitems; size = nsize; @@ -253,12 +253,12 @@ @throw [OFOutOfRangeException newWithClass: isa]; nsize = ((count - nitems) * itemsize + lastpagebyte) & ~lastpagebyte; if (size != nsize) - data = [self resizeMem: data - toSize: nsize]; + data = [self resizeMemory: data + toSize: nsize]; count -= nitems; size = nsize; return self;