seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #107469 from Ivorforce/vector-localvector-explicit-span-conversions

Browse Source 
Remove implicit conversions between `LocalVector` and `Vector`
This commit is contained in:
Thaddeus Crews
2025-09-30 11:19:17 -05:00
parent 79d0eea742 abe3b481ae
commit 21fd4faf1b
19 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/linuxbsd/wayland/wayland_thread.cpp
View File

@ -103,7 +103,7 @@ Vector<uint8_t> WaylandThread::_read_fd(int fd) {
data.resize(bytes_read + chunk_size);
}
return data;
return Vector<uint8_t>(data);
}
// Based on the wayland book's shared memory boilerplate (PD/CC0).

2
platform/web/export/export_plugin.cpp
View File

@ -172,7 +172,7 @@ void EditorExportPlatformWeb::_fix_html(Vector<uint8_t> &p_html, const Ref<Edito
replaces["$GODOT_CONFIG"] = str_config;
replaces["$GODOT_SPLASH_COLOR"] = "#" + Color(get_project_setting(p_preset, "application/boot_splash/bg_color")).to_html(false);
LocalVector<String> godot_splash_classes;
Vector<String> godot_splash_classes;
godot_splash_classes.push_back("show-image--" + String(get_project_setting(p_preset, "application/boot_splash/show_image")));
godot_splash_classes.push_back("fullsize--" + String(get_project_setting(p_preset, "application/boot_splash/fullsize")));
godot_splash_classes.push_back("use-filter--" + String(get_project_setting(p_preset, "application/boot_splash/use_filter")));