ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-07 13:38:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

use size_t for Vector::minimumCapacity

Browse Source
This commit is contained in:
Joshua Warner 2014-02-25 19:45:32 -07:00
parent b711aef1b3
commit 892d359ba0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/avian/alloc-vector.h
View File

@ -40,7 +40,7 @@ class Vector {
} }
void dispose() { void dispose() {
if (data.items and minimumCapacity >= 0) { if (data.items and minimumCapacity > 0) {
allocator->free(data.items, data.count); allocator->free(data.items, data.count);
data.items = 0; data.items = 0;
data.count = 0; data.count = 0;
@ -53,13 +53,13 @@ class Vector {
this->data = data; this->data = data;
this->position = 0; this->position = 0;
this->minimumCapacity = -1; this->minimumCapacity = 0;
} }
void ensure(size_t space) void ensure(size_t space)
{ {
if (position + space > data.count) { if (position + space > data.count) {
assert(a, minimumCapacity >= 0); assert(a, minimumCapacity > 0);
size_t newCapacity = avian::util::max( size_t newCapacity = avian::util::max(
position + space, avian::util::max(minimumCapacity, data.count * 2)); position + space, avian::util::max(minimumCapacity, data.count * 2));
@ -177,7 +177,7 @@ class Vector {
avian::util::Allocator* allocator; avian::util::Allocator* allocator;
avian::util::Slice<uint8_t> data; avian::util::Slice<uint8_t> data;
size_t position; size_t position;
int minimumCapacity; size_t minimumCapacity;
}; };
} // namespace vm } // namespace vm