[Bf-blender-cvs] [91071973208] functions: use ArrayRef in more places

Jacques Lucke noreply at git.blender.org
Thu May 16 12:03:05 CEST 2019


Commit: 9107197320892390afc7fdbd63781bf53e9b4737
Author: Jacques Lucke
Date:   Thu May 16 11:46:39 2019 +0200
Branches: functions
https://developer.blender.org/rB9107197320892390afc7fdbd63781bf53e9b4737

use ArrayRef in more places

===================================================================

M	source/blender/functions/frontends/data_flow_nodes/btree_lookup.hpp
M	source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
M	source/blender/functions/frontends/data_flow_nodes/inserters.cpp
M	source/blender/functions/frontends/data_flow_nodes/inserters.hpp
M	source/blender/functions/frontends/data_flow_nodes/util_wrappers.hpp

===================================================================

diff --git a/source/blender/functions/frontends/data_flow_nodes/btree_lookup.hpp b/source/blender/functions/frontends/data_flow_nodes/btree_lookup.hpp
index a580c730405..b28ed75b3f3 100644
--- a/source/blender/functions/frontends/data_flow_nodes/btree_lookup.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/btree_lookup.hpp
@@ -16,7 +16,7 @@ class BTreeLookup {
     bNodeLink *source_link;
   };
 
-  const SmallVector<DataLink> data_links()
+  const ArrayRef<DataLink> data_links()
   {
     return m_data_links;
   }
diff --git a/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp b/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
index c89decf26b3..5f631d4c3ad 100644
--- a/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
@@ -150,7 +150,7 @@ static bool insert_links(BTreeGraphBuilder &builder, GraphInserters &inserters)
 
 static void insert_unlinked_inputs(BTreeGraphBuilder &builder, GraphInserters &inserters)
 {
-  BSockets unlinked_inputs;
+  SmallVector<bNodeSocket *> unlinked_inputs;
   DFGB_SocketVector node_inputs;
 
   for (bNode *bnode : bNodeList(&builder.btree()->nodes)) {
diff --git a/source/blender/functions/frontends/data_flow_nodes/inserters.cpp b/source/blender/functions/frontends/data_flow_nodes/inserters.cpp
index c73fe5a498e..f2c54a8c2fa 100644
--- a/source/blender/functions/frontends/data_flow_nodes/inserters.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/inserters.cpp
@@ -93,12 +93,14 @@ bool GraphInserters::insert_node(BTreeGraphBuilder &builder, bNode *bnode)
 class SocketLoaderBody : public TupleCallBody {
  private:
   bNodeTree *m_btree;
-  BSockets m_bsockets;
+  SmallVector<bNodeSocket *> m_bsockets;
   SmallVector<SocketLoader> m_loaders;
 
  public:
-  SocketLoaderBody(bNodeTree *btree, BSockets &bsockets, SmallVector<SocketLoader> &loaders)
-      : m_btree(btree), m_bsockets(bsockets), m_loaders(loaders)
+  SocketLoaderBody(bNodeTree *btree,
+                   ArrayRef<bNodeSocket *> bsockets,
+                   SmallVector<SocketLoader> &loaders)
+      : m_btree(btree), m_bsockets(bsockets.to_small_vector()), m_loaders(loaders)
   {
   }
 
@@ -115,7 +117,8 @@ class SocketLoaderBody : public TupleCallBody {
   }
 };
 
-DFGB_SocketVector GraphInserters::insert_sockets(BTreeGraphBuilder &builder, BSockets &bsockets)
+DFGB_SocketVector GraphInserters::insert_sockets(BTreeGraphBuilder &builder,
+                                                 ArrayRef<bNodeSocket *> bsockets)
 {
   SmallVector<SocketLoader> loaders;
 
diff --git a/source/blender/functions/frontends/data_flow_nodes/inserters.hpp b/source/blender/functions/frontends/data_flow_nodes/inserters.hpp
index f279dd1e4b1..c4e1092de43 100644
--- a/source/blender/functions/frontends/data_flow_nodes/inserters.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/inserters.hpp
@@ -41,7 +41,8 @@ class GraphInserters {
 
   bool insert_node(BTreeGraphBuilder &builder, struct bNode *bnode);
 
-  DFGB_SocketVector insert_sockets(BTreeGraphBuilder &builder, BSockets &bsockets);
+  DFGB_SocketVector insert_sockets(BTreeGraphBuilder &builder,
+                                   ArrayRef<struct bNodeSocket *> bsockets);
 
   bool insert_link(BTreeGraphBuilder &builder,
                    struct bNodeSocket *from_bsocket,
diff --git a/source/blender/functions/frontends/data_flow_nodes/util_wrappers.hpp b/source/blender/functions/frontends/data_flow_nodes/util_wrappers.hpp
index d178a463a90..a0e8fd5c643 100644
--- a/source/blender/functions/frontends/data_flow_nodes/util_wrappers.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/util_wrappers.hpp
@@ -14,8 +14,6 @@ namespace DataFlowNodes {
 using bNodeList = ListBaseWrapper<struct bNode, true>;
 using bLinkList = ListBaseWrapper<struct bNodeLink, true>;
 using bSocketList = ListBaseWrapper<struct bNodeSocket, true>;
-using BSockets = SmallVector<struct bNodeSocket *>;
-using BNodes = SmallVector<struct bNode *>;
 
 }  // namespace DataFlowNodes
 }  // namespace FN



More information about the Bf-blender-cvs mailing list