mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-11 05:25:32 +03:00
AK: Delete Vector::resize() from Nonnull{Own,Ref}PtrVector.
It's not possible to grow one of these vectors beyond what's already in them since it's not possible to default-construct Nonnull{Own,Ref}Ptr. Add Vector::shrink() which can be used when you want to shrink the Vector and delete resize() from the specialized Vectors.
This commit is contained in:
parent
394168c0ca
commit
1686c4906b
Notes:
sideshowbarker
2024-07-19 13:04:26 +09:00
Author: https://github.com/awesomekling Commit: https://github.com/SerenityOS/serenity/commit/1686c4906b7
@ -41,6 +41,12 @@ public:
|
||||
const T& first() const { return at(0); }
|
||||
T& last() { return at(size() - 1); }
|
||||
const T& last() const { return at(size() - 1); }
|
||||
|
||||
private:
|
||||
// NOTE: You can't use resize() on a NonnullOwnPtrVector since making the vector
|
||||
// bigger would require being able to default-construct NonnullOwnPtrs.
|
||||
// Instead, use shrink(new_size).
|
||||
void resize(int) = delete;
|
||||
};
|
||||
|
||||
}
|
||||
|
@ -41,6 +41,12 @@ public:
|
||||
const T& first() const { return at(0); }
|
||||
T& last() { return at(size() - 1); }
|
||||
const T& last() const { return at(size() - 1); }
|
||||
|
||||
private:
|
||||
// NOTE: You can't use resize() on a NonnullRefPtrVector since making the vector
|
||||
// bigger would require being able to default-construct NonnullRefPtrs.
|
||||
// Instead, use shrink(new_size).
|
||||
void resize(int) = delete;
|
||||
};
|
||||
|
||||
}
|
||||
|
24
AK/Vector.h
24
AK/Vector.h
@ -407,8 +407,9 @@ public:
|
||||
m_capacity = new_capacity;
|
||||
}
|
||||
|
||||
void resize(int new_size)
|
||||
void shrink(int new_size)
|
||||
{
|
||||
ASSERT(new_size <= size());
|
||||
if (new_size == size())
|
||||
return;
|
||||
|
||||
@ -417,14 +418,19 @@ public:
|
||||
return;
|
||||
}
|
||||
|
||||
if (new_size > size()) {
|
||||
ensure_capacity(new_size);
|
||||
for (int i = size(); i < new_size; ++i)
|
||||
new (slot(i)) T;
|
||||
} else {
|
||||
for (int i = new_size; i < size(); ++i)
|
||||
at(i).~T();
|
||||
}
|
||||
for (int i = new_size; i < size(); ++i)
|
||||
at(i).~T();
|
||||
m_size = new_size;
|
||||
}
|
||||
|
||||
void resize(int new_size)
|
||||
{
|
||||
if (new_size <= size())
|
||||
return shrink(new_size);
|
||||
|
||||
ensure_capacity(new_size);
|
||||
for (int i = size(); i < new_size; ++i)
|
||||
new (slot(i)) T;
|
||||
m_size = new_size;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user