diff options
author | Jacques Lucke <jacques@blender.org> | 2020-07-20 13:16:20 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-07-20 13:16:20 +0300 |
commit | 8cbbdedaf4dfec9e320e7e2be58b75d256950df1 (patch) | |
tree | 496b9620e11ac44e515b0bb4ca52c05834d557f9 /source/blender/nodes/intern | |
parent | 686ab4c9401a90b22fb17e46c992eb513fe4f693 (diff) |
Refactor: Update integer type usage
This updates the usage of integer types in code I wrote according to our new style guides.
Major changes:
* Use signed instead of unsigned integers in many places.
* C++ containers in blenlib use `int64_t` for size and indices now (instead of `uint`).
* Hash values for C++ containers are 64 bit wide now (instead of 32 bit).
I do hope that I broke no builds, but it is quite likely that some compiler reports
slightly different errors. Please let me know when there are any errors. If the fix
is small, feel free to commit it yourself.
I compiled successfully on linux with gcc and on windows.
Diffstat (limited to 'source/blender/nodes/intern')
-rw-r--r-- | source/blender/nodes/intern/derived_node_tree.cc | 18 | ||||
-rw-r--r-- | source/blender/nodes/intern/node_tree_multi_function.cc | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/nodes/intern/derived_node_tree.cc b/source/blender/nodes/intern/derived_node_tree.cc index daec67b53a9..b7c78cb1499 100644 --- a/source/blender/nodes/intern/derived_node_tree.cc +++ b/source/blender/nodes/intern/derived_node_tree.cc @@ -83,7 +83,7 @@ DNode &DerivedNodeTree::create_node(const NodeRef &node_ref, node.outputs_ = allocator_.construct_elements_and_pointer_array<DOutputSocket>( node_ref.outputs().size()); - for (uint i : node.inputs_.index_range()) { + for (int i : node.inputs_.index_range()) { const InputSocketRef &socket_ref = node_ref.input(i); DInputSocket &socket = *node.inputs_[i]; @@ -94,7 +94,7 @@ DNode &DerivedNodeTree::create_node(const NodeRef &node_ref, r_sockets_map[socket_ref.id()] = &socket; } - for (uint i : node.outputs_.index_range()) { + for (int i : node.outputs_.index_range()) { const OutputSocketRef &socket_ref = node_ref.output(i); DOutputSocket &socket = *node.outputs_[i]; @@ -113,7 +113,7 @@ BLI_NOINLINE void DerivedNodeTree::expand_groups(Vector<DNode *> &all_nodes, Vector<DParentNode *> &all_parent_nodes, NodeTreeRefMap &node_tree_refs) { - for (uint i = 0; i < all_nodes.size(); i++) { + for (int i = 0; i < all_nodes.size(); i++) { DNode &node = *all_nodes[i]; if (node.node_ref_->is_group_node()) { this->expand_group_node(node, all_nodes, all_group_inputs, all_parent_nodes, node_tree_refs); @@ -181,10 +181,10 @@ BLI_NOINLINE void DerivedNodeTree::relink_group_inputs(const NodeTreeRef &group_ const NodeRef &input_node_ref = *node_refs[0]; DNode &input_node = *nodes_by_id[input_node_ref.id()]; - uint input_amount = group_node.inputs().size(); + int input_amount = group_node.inputs().size(); BLI_assert(input_amount == input_node_ref.outputs().size() - 1); - for (uint input_index : IndexRange(input_amount)) { + for (int input_index : IndexRange(input_amount)) { DInputSocket *outside_group = group_node.inputs_[input_index]; DOutputSocket *inside_group = input_node.outputs_[input_index]; @@ -228,10 +228,10 @@ BLI_NOINLINE void DerivedNodeTree::relink_group_outputs(const NodeTreeRef &group const NodeRef &output_node_ref = *node_refs[0]; DNode &output_node = *nodes_by_id[output_node_ref.id()]; - uint output_amount = group_node.outputs().size(); + int output_amount = group_node.outputs().size(); BLI_assert(output_amount == output_node_ref.inputs().size() - 1); - for (uint output_index : IndexRange(output_amount)) { + for (int output_index : IndexRange(output_amount)) { DOutputSocket *outside_group = group_node.outputs_[output_index]; DInputSocket *inside_group = output_node.inputs_[output_index]; @@ -316,7 +316,7 @@ BLI_NOINLINE void DerivedNodeTree::store_in_this_and_init_ids( group_inputs_ = std::move(all_group_inputs); parent_nodes_ = std::move(all_parent_nodes); - for (uint node_index : nodes_by_id_.index_range()) { + for (int node_index : nodes_by_id_.index_range()) { DNode *node = nodes_by_id_[node_index]; node->id_ = node_index; @@ -333,7 +333,7 @@ BLI_NOINLINE void DerivedNodeTree::store_in_this_and_init_ids( } } - for (uint i : group_inputs_.index_range()) { + for (int i : group_inputs_.index_range()) { group_inputs_[i]->id_ = i; } } diff --git a/source/blender/nodes/intern/node_tree_multi_function.cc b/source/blender/nodes/intern/node_tree_multi_function.cc index f77b19354a4..82842c4ef32 100644 --- a/source/blender/nodes/intern/node_tree_multi_function.cc +++ b/source/blender/nodes/intern/node_tree_multi_function.cc @@ -62,7 +62,7 @@ const fn::MultiFunction &NodeMFNetworkBuilder::get_default_fn(StringRef name) static void insert_dummy_node(CommonMFNetworkBuilderData &common, const DNode &dnode) { - constexpr uint stack_capacity = 10; + constexpr int stack_capacity = 10; Vector<fn::MFDataType, stack_capacity> input_types; Vector<StringRef, stack_capacity> input_names; @@ -159,7 +159,7 @@ static fn::MFOutputSocket *try_find_origin(CommonMFNetworkBuilderData &common, { Span<const DOutputSocket *> from_dsockets = to_dsocket.linked_sockets(); Span<const DGroupInput *> from_group_inputs = to_dsocket.linked_group_inputs(); - uint total_linked_amount = from_dsockets.size() + from_group_inputs.size(); + int total_linked_amount = from_dsockets.size() + from_group_inputs.size(); BLI_assert(total_linked_amount <= 1); if (total_linked_amount == 0) { |