From 35aaf2fe518fbcf8fcef8ca7403ff60c13ef1ae4 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Fri, 3 Jan 2020 13:40:31 +0100 Subject: use IndexToRefMap instead of IndexMap --- .../functions/FN_node_tree_multi_function_network.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'source/blender/functions/FN_node_tree_multi_function_network.h') diff --git a/source/blender/functions/FN_node_tree_multi_function_network.h b/source/blender/functions/FN_node_tree_multi_function_network.h index 206d285384f..fb2519ff866 100644 --- a/source/blender/functions/FN_node_tree_multi_function_network.h +++ b/source/blender/functions/FN_node_tree_multi_function_network.h @@ -4,13 +4,13 @@ #include "FN_node_tree.h" #include "BLI_multi_map.h" -#include "BLI_index_map.h" +#include "BLI_index_to_ref_map.h" #include "FN_multi_function_network.h" namespace FN { -using BLI::IndexMap; +using BLI::IndexToRefMap; using BLI::MultiMap; #define IdMultiMap_UNMAPPED UINT_MAX @@ -80,14 +80,14 @@ class InlinedTreeMFSocketMap { const FunctionNodeTree *m_function_tree; const MFNetwork *m_network; - IndexMap m_dummy_socket_by_fsocket_id; - IndexMap m_fsocket_by_dummy_socket_id; + IndexToRefMap m_dummy_socket_by_fsocket_id; + IndexToRefMap m_fsocket_by_dummy_socket_id; public: InlinedTreeMFSocketMap(const FunctionNodeTree &function_tree, const MFNetwork &network, - IndexMap dummy_socket_by_fsocket_id, - IndexMap fsocket_by_dummy_socket_id) + IndexToRefMap dummy_socket_by_fsocket_id, + IndexToRefMap fsocket_by_dummy_socket_id) : m_function_tree(&function_tree), m_network(&network), m_dummy_socket_by_fsocket_id(std::move(dummy_socket_by_fsocket_id)), @@ -107,24 +107,24 @@ class InlinedTreeMFSocketMap { const MFInputSocket &lookup_singly_mapped_input_socket(const FInputSocket &fsocket) const { - return m_dummy_socket_by_fsocket_id.lookup(fsocket.id())->as_input(); + return m_dummy_socket_by_fsocket_id.lookup(fsocket.id()).as_input(); } const MFOutputSocket &lookup_socket(const FOutputSocket &fsocket) const { - return m_dummy_socket_by_fsocket_id.lookup(fsocket.id())->as_output(); + return m_dummy_socket_by_fsocket_id.lookup(fsocket.id()).as_output(); } const FInputSocket &lookup_fsocket(const MFInputSocket &socket) const { BLI_assert(socket.node().is_dummy()); - return m_fsocket_by_dummy_socket_id.lookup(socket.id())->as_input(); + return m_fsocket_by_dummy_socket_id.lookup(socket.id()).as_input(); } const FOutputSocket &lookup_fsocket(const MFOutputSocket &socket) const { BLI_assert(socket.node().is_dummy()); - return m_fsocket_by_dummy_socket_id.lookup(socket.id())->as_output(); + return m_fsocket_by_dummy_socket_id.lookup(socket.id()).as_output(); } }; -- cgit v1.2.3