godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Merge pull request #111342 from Ivorforce/dict-assert-no-string

Browse Source 
Assert that `dictionary.h` does not include `String`, and that neither of the fundamental containers include `Object`
This commit is contained in:
Thaddeus Crews
2025-10-09 11:46:50 -05:00
parent 4ab22026b6 839e0358b3
commit c41e47034e
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/string/ustring.cpp
View File

@@ -30,8 +30,9 @@
#include "ustring.h" #include "ustring.h"
STATIC_ASSERT_INCOMPLETE_TYPE(class, Dictionary);
STATIC_ASSERT_INCOMPLETE_TYPE(class, Array); STATIC_ASSERT_INCOMPLETE_TYPE(class, Array);
STATIC_ASSERT_INCOMPLETE_TYPE(class, Dictionary);
STATIC_ASSERT_INCOMPLETE_TYPE(class, Object);
#include "core/crypto/crypto_core.h" #include "core/crypto/crypto_core.h"
#include "core/math/color.h" #include "core/math/color.h"

1
core/variant/array.cpp
View File

@@ -31,6 +31,7 @@
#include "array.h" #include "array.h"
STATIC_ASSERT_INCOMPLETE_TYPE(class, Dictionary); STATIC_ASSERT_INCOMPLETE_TYPE(class, Dictionary);
STATIC_ASSERT_INCOMPLETE_TYPE(class, Object);
STATIC_ASSERT_INCOMPLETE_TYPE(class, String); STATIC_ASSERT_INCOMPLETE_TYPE(class, String);
#include "container_type_validate.h" #include "container_type_validate.h"

2
core/variant/dictionary.cpp
View File

@@ -31,6 +31,8 @@
#include "dictionary.h" #include "dictionary.h"
STATIC_ASSERT_INCOMPLETE_TYPE(class, Array); STATIC_ASSERT_INCOMPLETE_TYPE(class, Array);
STATIC_ASSERT_INCOMPLETE_TYPE(class, Object);
STATIC_ASSERT_INCOMPLETE_TYPE(class, String);
#include "core/templates/hash_map.h" #include "core/templates/hash_map.h"
#include "core/templates/safe_refcount.h" #include "core/templates/safe_refcount.h"