From f68cfd6bb078482c4a779a6e26a56e2734edb5b8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 25 Sep 2022 18:33:28 +1000 Subject: Cleanup: replace C-style casts with functional casts for numeric types --- source/blender/depsgraph/intern/builder/deg_builder_cache.cc | 4 ++-- source/blender/depsgraph/intern/builder/deg_builder_cycle.cc | 2 +- source/blender/depsgraph/intern/depsgraph_debug.cc | 2 +- source/blender/depsgraph/intern/eval/deg_eval_flush.cc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/depsgraph') diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cache.cc b/source/blender/depsgraph/intern/builder/deg_builder_cache.cc index 0a86cd62576..a9f8d1f73d3 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_cache.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_cache.cc @@ -59,8 +59,8 @@ bool operator==(const AnimatedPropertyID &a, const AnimatedPropertyID &b) uint64_t AnimatedPropertyID::hash() const { - uintptr_t ptr1 = (uintptr_t)data; - uintptr_t ptr2 = (uintptr_t)property_rna; + uintptr_t ptr1 = uintptr_t(data); + uintptr_t ptr2 = uintptr_t(property_rna); return uint64_t(((ptr1 >> 4) * 33) ^ (ptr2 >> 4)); } diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc index 8ba6c840a59..7f3c59f1522 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc @@ -60,7 +60,7 @@ struct CyclesSolverState { inline void set_node_visited_state(Node *node, eCyclicCheckVisitedState state) { - node->custom_flags = (node->custom_flags & ~0x3) | (int)state; + node->custom_flags = (node->custom_flags & ~0x3) | int(state); } inline eCyclicCheckVisitedState get_node_visited_state(Node *node) diff --git a/source/blender/depsgraph/intern/depsgraph_debug.cc b/source/blender/depsgraph/intern/depsgraph_debug.cc index ddad00bc0e8..2f528873f1d 100644 --- a/source/blender/depsgraph/intern/depsgraph_debug.cc +++ b/source/blender/depsgraph/intern/depsgraph_debug.cc @@ -171,7 +171,7 @@ bool DEG_debug_consistency_check(Depsgraph *graph) node->identifier().c_str(), node->num_links_pending, num_links_pending); - printf("Number of inlinks: %d\n", (int)node->inlinks.size()); + printf("Number of inlinks: %d\n", int(node->inlinks.size())); return false; } } diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc index 08ce7bed83b..a5b29ae56a9 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc @@ -235,7 +235,7 @@ void flush_editors_id_update(Depsgraph *graph, const DEGEditorUpdateContext *upd EVAL, "Accumulated recalc bits for %s: %u\n", id_orig->name, - (uint)id_cow->recalc); + uint(id_cow->recalc)); /* Inform editors. Only if the data-block is being evaluated a second * time, to distinguish between user edits and initial evaluation when -- cgit v1.2.3