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

Merge pull request #111223 from Ivorforce/remove-iterator-include

Browse Source 
Replace `std::size` usage with `std_size` to avoid `<iterator>` include.
This commit is contained in:
Thaddeus Crews
2025-10-06 09:06:49 -05:00
parent 93a5f4fab2 1db0a60dc0
commit d1d28c0bcf
39 changed files with 67 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platform/windows/crash_handler_windows_signal.cpp
View File

@ -43,7 +43,6 @@
#include <algorithm>
#include <csignal>
#include <cstdlib>
#include <iterator>
#include <string>
#include <vector>

8
platform/windows/export/export_plugin.cpp
View File

@ -120,7 +120,7 @@ Error EditorExportPlatformWindows::_process_icon(const Ref<EditorExportPreset> &
Ref<Image> src_image = _load_icon_or_splash_image(p_src_path, &err);
ERR_FAIL_COND_V(err != OK || src_image.is_null() || src_image->is_empty(), ERR_CANT_OPEN);
for (size_t i = 0; i < std::size(icon_size); ++i) {
for (size_t i = 0; i < std_size(icon_size); ++i) {
int size = (icon_size[i] == 0) ? 256 : icon_size[i];
Ref<Image> res_image = src_image->duplicate();
@ -131,7 +131,7 @@ Error EditorExportPlatformWindows::_process_icon(const Ref<EditorExportPreset> &
}
uint16_t valid_icon_count = 0;
for (size_t i = 0; i < std::size(icon_size); ++i) {
for (size_t i = 0; i < std_size(icon_size); ++i) {
if (images.has(icon_size[i])) {
valid_icon_count++;
} else {
@ -153,7 +153,7 @@ Error EditorExportPlatformWindows::_process_icon(const Ref<EditorExportPreset> &
// Write ICONDIRENTRY.
uint32_t img_offset = 6 + 16 * valid_icon_count;
for (size_t i = 0; i < std::size(icon_size); ++i) {
for (size_t i = 0; i < std_size(icon_size); ++i) {
if (images.has(icon_size[i])) {
const IconData &di = images[icon_size[i]];
fw->store_8(icon_size[i]); // Width in pixels.
@ -170,7 +170,7 @@ Error EditorExportPlatformWindows::_process_icon(const Ref<EditorExportPreset> &
}
// Write image data.
for (size_t i = 0; i < std::size(icon_size); ++i) {
for (size_t i = 0; i < std_size(icon_size); ++i) {
if (images.has(icon_size[i])) {
const IconData &di = images[icon_size[i]];
fw->store_buffer(di.data.ptr(), di.data.size());

2
platform/windows/os_windows.cpp
View File

@ -851,7 +851,7 @@ bool OS_Windows::get_user_prefers_integrated_gpu() const {
GetCurrentApplicationUserModelIdPtr GetCurrentApplicationUserModelId = (GetCurrentApplicationUserModelIdPtr)(void *)GetProcAddress(kernel32, "GetCurrentApplicationUserModelId");
if (GetCurrentApplicationUserModelId) {
UINT32 length = std::size(value_name);
UINT32 length = std_size(value_name);
LONG result = GetCurrentApplicationUserModelId(&length, value_name);
if (result == ERROR_SUCCESS) {
is_packaged = true;