griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Replace some asserts by static asserts.

Browse Source
This commit is contained in:
Bastien Montagne
2025-01-08 15:50:31 +01:00
parent db6606dab9
commit be936025ea
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/makesrna/intern/rna_wm.cc
View File

@@ -1719,7 +1719,7 @@ static StructRNA *rna_Operator_register(Main *bmain,
dummy_ot.description = *strings_table[2] ? strings_table[2] : nullptr;
dummy_ot.translation_context = strings_table[3];
dummy_ot.undo_group = strings_table[4];
BLI_assert(ARRAY_SIZE(strings) == 5);
BLI_STATIC_ASSERT(ARRAY_SIZE(strings) == 5, "Unexpected number of strings")
}
/* XXX, this doubles up with the operator name #29666.
@@ -1892,7 +1892,7 @@ static StructRNA *rna_MacroOperator_register(Main *bmain,
dummy_ot.description = *strings_table[2] ? strings_table[2] : nullptr;
dummy_ot.translation_context = strings_table[3];
dummy_ot.undo_group = strings_table[4];
BLI_assert(ARRAY_SIZE(strings) == 5);
BLI_STATIC_ASSERT(ARRAY_SIZE(strings) == 5, "Unexpected number of strings")
}
/* XXX, this doubles up with the operator name #29666.

2
source/blender/makesrna/intern/rna_wm_gizmo.cc
View File

@@ -885,7 +885,7 @@ static StructRNA *rna_GizmoGroup_register(Main *bmain,
dummy_wgt.idname = strings_table[0]; /* allocated string stored here */
dummy_wgt.name = strings_table[1];
BLI_assert(ARRAY_SIZE(strings) == 2);
BLI_STATIC_ASSERT(ARRAY_SIZE(strings) == 2, "Unexpected number of strings")
}
/* create a new gizmogroup type */

11
source/blender/python/intern/bpy_rna_types_capi.cc
View File

@@ -279,19 +279,20 @@ void BPY_rna_types_extend_capi()
BPY_rna_id_collection_batch_remove_method_def,
BPY_rna_id_collection_orphans_purge_method_def,
BPY_rna_data_context_method_def);
BLI_assert(ARRAY_SIZE(pyrna_blenddata_methods) == 5);
BLI_STATIC_ASSERT(ARRAY_SIZE(pyrna_blenddata_methods) == 5, "Unexpected number of methods")
pyrna_struct_type_extend_capi(&RNA_BlendData, pyrna_blenddata_methods, nullptr);
/* BlendDataLibraries */
ARRAY_SET_ITEMS(
pyrna_blenddatalibraries_methods, BPY_library_load_method_def, BPY_library_write_method_def);
BLI_assert(ARRAY_SIZE(pyrna_blenddatalibraries_methods) == 3);
BLI_STATIC_ASSERT(ARRAY_SIZE(pyrna_blenddatalibraries_methods) == 3,
"Unexpected number of methods")
pyrna_struct_type_extend_capi(
&RNA_BlendDataLibraries, pyrna_blenddatalibraries_methods, nullptr);
/* uiLayout */
ARRAY_SET_ITEMS(pyrna_uilayout_methods, BPY_rna_uilayout_introspect_method_def);
BLI_assert(ARRAY_SIZE(pyrna_uilayout_methods) == 2);
BLI_STATIC_ASSERT(ARRAY_SIZE(pyrna_uilayout_methods) == 2, "Unexpected number of methods")
pyrna_struct_type_extend_capi(&RNA_UILayout, pyrna_uilayout_methods, nullptr);
/* Space */
@@ -301,12 +302,12 @@ void BPY_rna_types_extend_capi()
ARRAY_SET_ITEMS(pyrna_text_methods,
BPY_rna_region_as_string_method_def,
BPY_rna_region_from_string_method_def);
BLI_assert(ARRAY_SIZE(pyrna_text_methods) == 3);
BLI_STATIC_ASSERT(ARRAY_SIZE(pyrna_text_methods) == 3, "Unexpected number of methods")
pyrna_struct_type_extend_capi(&RNA_Text, pyrna_text_methods, nullptr);
/* wmOperator */
ARRAY_SET_ITEMS(pyrna_operator_methods, BPY_rna_operator_poll_message_set_method_def);
BLI_assert(ARRAY_SIZE(pyrna_operator_methods) == 2);
BLI_STATIC_ASSERT(ARRAY_SIZE(pyrna_operator_methods) == 2, "Unexpected number of methods")
pyrna_struct_type_extend_capi(&RNA_Operator, pyrna_operator_methods, nullptr);
/* WindowManager */