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

Assert that `dictionary.h` does not include `String`, and that neither of the fundamental containers include `Object`

Author: Repiteo

core/string/ustring.cpp

@@ -30,8 +30,9 @@
 
 #include "ustring.h"
 
-STATIC_ASSERT_INCOMPLETE_TYPE(class, Dictionary);
 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/math/color.h"

core/variant/array.cpp

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

core/variant/dictionary.cpp

@@ -31,6 +31,8 @@
 #include "dictionary.h"
 
 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/safe_refcount.h"