diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-07-08 23:29:10 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-07-08 23:30:23 +0300 |
| commit | 31bc76ea4e4b83a728b88735bee48019125b4c54 (patch) | |
| tree | a9a86d604b3cfb74edee2286ad309f0f43c0d445 /source/blender/functions | |
| parent | 403384998a6bb5f428e15ced5503206b45032b25 (diff) | |
Cleanup: remove unnecessary calls to as_span
This uses the new implicit conversions and constructors
that have been committed in the previous commit.
I tested these changes on Linux with gcc and on Windows.
Diffstat (limited to 'source/blender/functions')
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/functions/FN_generic_vector_array.hh b/source/blender/functions/FN_generic_vector_array.hh index f28e94b34ee..2672484c184 100644 --- a/source/blender/functions/FN_generic_vector_array.hh +++ b/source/blender/functions/FN_generic_vector_array.hh @@ -78,7 +78,7 @@ class GVectorArray : NonCopyable, NonMovable { operator GVArraySpan() const { - return GVArraySpan(type_, starts_.as_span(), lengths_); + return GVArraySpan(type_, starts_, lengths_); } bool is_empty() const @@ -98,7 +98,7 @@ class GVectorArray : NonCopyable, NonMovable { Span<const void *> starts() const { - return starts_.as_span(); + return starts_; } Span<uint> lengths() const diff --git a/source/blender/functions/FN_multi_function_network.hh b/source/blender/functions/FN_multi_function_network.hh index 493b26e6510..42f24d9c44c 100644 --- a/source/blender/functions/FN_multi_function_network.hh +++ b/source/blender/functions/FN_multi_function_network.hh @@ -481,7 +481,7 @@ inline Span<MFInputSocket *> MFOutputSocket::targets() inline Span<const MFInputSocket *> MFOutputSocket::targets() const { - return targets_.as_span(); + return targets_; } /* -------------------------------------------------------------------- diff --git a/source/blender/functions/intern/multi_function_network_optimization.cc b/source/blender/functions/intern/multi_function_network_optimization.cc index 690c3330045..f3618612bc5 100644 --- a/source/blender/functions/intern/multi_function_network_optimization.cc +++ b/source/blender/functions/intern/multi_function_network_optimization.cc @@ -287,14 +287,14 @@ void constant_folding(MFNetwork &network, ResourceCollector &resources) } Array<MFOutputSocket *> folded_sockets = compute_constant_sockets_and_add_folded_nodes( - network, inputs_to_fold.as_span(), resources); + network, inputs_to_fold, resources); for (uint i : inputs_to_fold.index_range()) { MFOutputSocket &original_socket = *inputs_to_fold[i]->origin(); network.relink(original_socket, *folded_sockets[i]); } - network.remove(temporary_nodes.as_span()); + network.remove(temporary_nodes); } /** \} */ |