northern-lighthouse/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #105505 from Ivorforce/simplify-force-trivial

Browse Source 
Simplify use of `LocalVector` `force_trivial` template parameter.
This commit is contained in:
Thaddeus Crews
2025-05-22 12:14:58 -05:00
parent dd5c5ed631 70f8dd29f5
commit 1b5064e3e3
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/templates/local_vector.h
View File

@ -61,11 +61,7 @@ public:
reserve(count + 1); reserve(count + 1);
} }
if constexpr (!std::is_trivially_constructible_v<T> && !force_trivial) { memnew_placement(&data[count++], T(std::move(p_elem)));
memnew_placement(&data[count++], T(std::move(p_elem)));
} else {
data[count++] = std::move(p_elem);
}
} }
void remove_at(U p_index) { void remove_at(U p_index) {
@ -74,9 +70,7 @@ public:
for (U i = p_index; i < count; i++) { for (U i = p_index; i < count; i++) {
data[i] = std::move(data[i + 1]); data[i] = std::move(data[i + 1]);
} }
if constexpr (!std::is_trivially_destructible_v<T> && !force_trivial) { data[count].~T();
data[count].~T();
}
} }
/// Removes the item copying the last value into the position of the one to /// Removes the item copying the last value into the position of the one to
@ -87,9 +81,7 @@ public:
if (count > p_index) { if (count > p_index) {
data[p_index] = std::move(data[count]); data[p_index] = std::move(data[count]);
} }
if constexpr (!std::is_trivially_destructible_v<T> && !force_trivial) { data[count].~T();
data[count].~T();
}
} }
_FORCE_INLINE_ bool erase(const T &p_val) { _FORCE_INLINE_ bool erase(const T &p_val) {
@ -163,8 +155,12 @@ public:
} }
void resize(U p_size) { void resize(U p_size) {
// We must statically assert this in a function because otherwise,
// `LocalVector` cannot be used with a forward-declared type.
static_assert(!force_trivial || std::is_trivially_destructible_v<T>, "T must be trivially destructible if force_trivial is set");
if (p_size < count) { if (p_size < count) {
if constexpr (!std::is_trivially_destructible_v<T> && !force_trivial) { if constexpr (!std::is_trivially_destructible_v<T>) {
for (U i = p_size; i < count; i++) { for (U i = p_size; i < count; i++) {
data[i].~T(); data[i].~T();
} }