am ce7e2781
: Merge "Add Vector::resize()" into jb-mr2-dev
* commit 'ce7e278151d268f3cf55bcecd05f6be8c7e82e0f': Add Vector::resize()
This commit is contained in:
commit
df608eb15d
@ -80,7 +80,13 @@ public:
|
||||
//! sets the capacity. capacity can never be reduced less than size()
|
||||
inline ssize_t setCapacity(size_t size) { return VectorImpl::setCapacity(size); }
|
||||
|
||||
/*!
|
||||
/*!
|
||||
* set the size of the vector. items are appended with the default
|
||||
* constructor, or removed from the end as needed.
|
||||
*/
|
||||
inline ssize_t resize(size_t size) { return VectorImpl::resize(size); }
|
||||
|
||||
/*!
|
||||
* C-style array access
|
||||
*/
|
||||
|
||||
|
@ -64,6 +64,7 @@ public:
|
||||
inline bool isEmpty() const { return mCount == 0; }
|
||||
size_t capacity() const;
|
||||
ssize_t setCapacity(size_t size);
|
||||
ssize_t resize(size_t size);
|
||||
|
||||
/*! append/insert another vector or array */
|
||||
ssize_t insertVectorAt(const VectorImpl& vector, size_t index);
|
||||
|
@ -343,6 +343,16 @@ ssize_t VectorImpl::setCapacity(size_t new_capacity)
|
||||
return new_capacity;
|
||||
}
|
||||
|
||||
ssize_t VectorImpl::resize(size_t size) {
|
||||
ssize_t result = NO_ERROR;
|
||||
if (size > mCount) {
|
||||
result = insertAt(mCount, size - mCount);
|
||||
} else if (size < mCount) {
|
||||
result = removeItemsAt(size, mCount - size);
|
||||
}
|
||||
return result < 0 ? result : size;
|
||||
}
|
||||
|
||||
void VectorImpl::release_storage()
|
||||
{
|
||||
if (mStorage) {
|
||||
|
Loading…
Reference in New Issue
Block a user