Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 22:00:10 +00:00
Code Issues Projects Releases Packages 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
commit d1d28c0bcf
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
39 changed files with 67 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/core/string/test_string.h
View file

@ -1997,7 +1997,7 @@ TEST_CASE("[String] Is_*") {
static bool isflt[] = { true, true, true, false, true, true, false, false, false, false, false, false, false, true, true };
static bool isaid[] = { false, false, false, false, false, false, false, false, true, true, false, false, false, false, false };
static bool isuid[] = { false, false, false, false, false, false, false, false, true, true, false, false, true, false, false };
for (unsigned int i = 0; i < std::size(data); i++) {
for (unsigned int i = 0; i < std_size(data); i++) {
String s = String::utf8(data[i]);
CHECK(s.is_numeric() == isnum[i]);
CHECK(s.is_valid_int() == isint[i]);

18
tests/core/templates/test_vector.h
View file

@ -220,7 +220,7 @@ TEST_CASE("[Vector] To byte array (variant call)") {
PackedInt32Array vector[] = { { 0, -1, 2008 }, {} };
PackedByteArray out[] = { { /* 0 */ 0x00, 0x00, 0x00, 0x00, /* -1 */ 0xFF, 0xFF, 0xFF, 0xFF, /* 2008 */ 0xD8, 0x07, 0x00, 0x00 }, {} };
for (size_t i = 0; i < std::size(vector); i++) {
for (size_t i = 0; i < std_size(vector); i++) {
Callable::CallError err;
Variant v_ret;
Variant v_vector = vector[i];
@ -235,7 +235,7 @@ TEST_CASE("[Vector] To byte array (variant call)") {
PackedInt64Array vector[] = { { 0, -1, 2008 }, {} };
PackedByteArray out[] = { { /* 0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* -1 */ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* 2008 */ 0xD8, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, {} };
for (size_t i = 0; i < std::size(vector); i++) {
for (size_t i = 0; i < std_size(vector); i++) {
Callable::CallError err;
Variant v_ret;
Variant v_vector = vector[i];
@ -250,7 +250,7 @@ TEST_CASE("[Vector] To byte array (variant call)") {
PackedFloat32Array vector[] = { { 0.0, -1.0, 200e24 }, {} };
PackedByteArray out[] = { { /* 0.0 */ 0x00, 0x00, 0x00, 0x00, /* -1.0 */ 0x00, 0x00, 0x80, 0xBF, /* 200e24 */ 0xA6, 0x6F, 0x25, 0x6B }, {} };
for (size_t i = 0; i < std::size(vector); i++) {
for (size_t i = 0; i < std_size(vector); i++) {
Callable::CallError err;
Variant v_ret;
Variant v_vector = vector[i];
@ -264,7 +264,7 @@ TEST_CASE("[Vector] To byte array (variant call)") {
PackedFloat64Array vector[] = { { 0.0, -1.0, 200e24 }, {} };
PackedByteArray out[] = { { /* 0.0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* -1.0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xBF, /* 200e24 */ 0x35, 0x03, 0x32, 0xB7, 0xF4, 0xAD, 0x64, 0x45 }, {} };
for (size_t i = 0; i < std::size(vector); i++) {
for (size_t i = 0; i < std_size(vector); i++) {
Callable::CallError err;
Variant v_ret;
Variant v_vector = vector[i];
@ -279,7 +279,7 @@ TEST_CASE("[Vector] To byte array (variant call)") {
PackedStringArray vector[] = { { "test", "string" }, {}, { "", "test" } };
PackedByteArray out[] = { { /* test */ 0x74, 0x65, 0x73, 0x74, /* null */ 0x00, /* string */ 0x73, 0x74, 0x72, 0x69, 0x6E, 0x67, /* null */ 0x00 }, {}, { /* null */ 0x00, /* test */ 0x74, 0x65, 0x73, 0x74, /* null */ 0x00 } };
for (size_t i = 0; i < std::size(vector); i++) {
for (size_t i = 0; i < std_size(vector); i++) {
Callable::CallError err;
Variant v_ret;
Variant v_vector = vector[i];
@ -298,7 +298,7 @@ TEST_CASE("[Vector] To byte array (variant call)") {
PackedByteArray out[] = { { /* X=0.0 */ 0x00, 0x00, 0x00, 0x00, /* Y=0.0 */ 0x00, 0x00, 0x00, 0x00, /* X=1.0 */ 0x00, 0x00, 0x80, 0x3F, /* Y=-1.0 */ 0x00, 0x00, 0x80, 0xBF }, {} };
#endif
for (size_t i = 0; i < std::size(vector); i++) {
for (size_t i = 0; i < std_size(vector); i++) {
Callable::CallError err;
Variant v_ret;
Variant v_vector = vector[i];
@ -317,7 +317,7 @@ TEST_CASE("[Vector] To byte array (variant call)") {
PackedByteArray out[] = { { /* X=0.0 */ 0x00, 0x00, 0x00, 0x00, /* Y=0.0 */ 0x00, 0x00, 0x00, 0x00, /* Z=0.0 */ 0x00, 0x00, 0x00, 0x00, /* X=1.0 */ 0x00, 0x00, 0x80, 0x3F, /* Y=1.0 */ 0x00, 0x00, 0x80, 0x3F, /* Z=-1.0 */ 0x00, 0x00, 0x80, 0xBF }, {} };
#endif
for (size_t i = 0; i < std::size(vector); i++) {
for (size_t i = 0; i < std_size(vector); i++) {
Callable::CallError err;
Variant v_ret;
Variant v_vector = vector[i];
@ -332,7 +332,7 @@ TEST_CASE("[Vector] To byte array (variant call)") {
PackedColorArray vector[] = { { Color(), Color(1, 1, 1) }, {} };
PackedByteArray out[] = { { /* R=0.0 */ 0x00, 0x00, 0x00, 0x00, /* G=0.0 */ 0x00, 0x00, 0x00, 0x00, /* B=0.0 */ 0x00, 0x00, 0x00, 0x00, /* A=1.0 */ 0x00, 0x00, 0x80, 0x3F, /* R=1.0 */ 0x00, 0x00, 0x80, 0x3F, /* G=1.0 */ 0x00, 0x00, 0x80, 0x3F, /* B=1.0 */ 0x00, 0x00, 0x80, 0x3F, /* A=1.0 */ 0x00, 0x00, 0x80, 0x3F }, {} };
for (size_t i = 0; i < std::size(vector); i++) {
for (size_t i = 0; i < std_size(vector); i++) {
Callable::CallError err;
Variant v_ret;
Variant v_vector = vector[i];
@ -351,7 +351,7 @@ TEST_CASE("[Vector] To byte array (variant call)") {
PackedByteArray out[] = { { /* X=0.0 */ 0x00, 0x00, 0x00, 0x00, /* Y=0.0 */ 0x00, 0x00, 0x00, 0x00, /* Z=0.0 */ 0x00, 0x00, 0x00, 0x00, /* W 0.0 */ 0x00, 0x00, 0x00, 0x00, /* X 1.0 */ 0x00, 0x00, 0x80, 0x3F, /* Y=-1.0 */ 0x00, 0x00, 0x80, 0xBF, /* Z=1.0 */ 0x00, 0x00, 0x80, 0x3F, /* W=-1.0 */ 0x00, 0x00, 0x80, 0xBF }, {} };
#endif
for (size_t i = 0; i < std::size(vector); i++) {
for (size_t i = 0; i < std_size(vector); i++) {
Callable::CallError err;
Variant v_ret;
Variant v_vector = vector[i];

4
tests/core/test_crypto.h
View file

@ -59,8 +59,8 @@ PackedByteArray raw_to_pba(const uint8_t *arr, size_t len) {
TEST_CASE("[Crypto] PackedByteArray constant time compare") {
const uint8_t hm1[] = { 144, 140, 176, 38, 88, 113, 101, 45, 71, 105, 10, 91, 248, 16, 117, 244, 189, 30, 238, 29, 219, 134, 82, 130, 212, 114, 161, 166, 188, 169, 200, 106 };
const uint8_t hm2[] = { 80, 30, 144, 228, 108, 38, 188, 125, 150, 64, 165, 127, 221, 118, 144, 232, 45, 100, 15, 248, 193, 244, 245, 34, 116, 147, 132, 200, 110, 27, 38, 75 };
PackedByteArray p1 = raw_to_pba(hm1, std::size(hm1));
PackedByteArray p2 = raw_to_pba(hm2, std::size(hm2));
PackedByteArray p1 = raw_to_pba(hm1, std_size(hm1));
PackedByteArray p2 = raw_to_pba(hm2, std_size(hm2));
_MockCrypto crypto;
bool equal = crypto.constant_time_compare(p1, p1);
CHECK(equal);

2
tests/servers/test_text_server.h
View file

@ -497,7 +497,7 @@ TEST_SUITE("[TextServer]") {
{ U"test\r test", { 0, 5, 5, 10 } },
{ U"test\r test \r test", { 0, 5, 5, 12, 12, 17 } },
};
for (size_t j = 0; j < std::size(cases); j++) {
for (size_t j = 0; j < std_size(cases); j++) {
RID ctx = ts->create_shaped_text();
CHECK_FALSE_MESSAGE(ctx == RID(), "Creating text buffer failed.");
bool ok = ts->shaped_text_add_string(ctx, cases[j].text, font, 16);