[Bf-blender-cvs] [0f47a7d0d78] functions: use Array instead of Vector

[Jacques Lucke]

Commit: 0f47a7d0d7837762f26d864c4dae116005e90aa8
Author: Jacques Lucke
Date:   Wed Sep 11 13:29:17 2019 +0200
Branches: functions
https://developer.blender.org/rB0f47a7d0d7837762f26d864c4dae116005e90aa8

use Array instead of Vector

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

M	source/blender/functions/frontends/data_flow_nodes/vtree_data_graph.cpp
M	source/blender/functions/frontends/data_flow_nodes/vtree_data_graph.hpp
M	source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp

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

diff --git a/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph.cpp b/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph.cpp
index 699dbdfc165..d67a9448003 100644
--- a/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph.cpp
@@ -9,7 +9,7 @@ using BLI::Stack;
 
 VTreeDataGraph::VTreeDataGraph(VirtualNodeTree &vtree,
                                SharedDataGraph graph,
-                               Vector<DataSocket> mapping)
+                               Array<DataSocket> mapping)
     : m_vtree(vtree), m_graph(std::move(graph)), m_socket_map(std::move(mapping))
 {
 }
diff --git a/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph.hpp b/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph.hpp
index 5f2fbb6d371..c7d0d38e98e 100644
--- a/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph.hpp
@@ -3,6 +3,7 @@
 #include "FN_core.hpp"
 #include "BKE_node_tree.hpp"
 #include "BLI_value_or_error.hpp"
+#include "BLI_array.hpp"
 
 namespace FN {
 namespace DataFlowNodes {
@@ -10,16 +11,17 @@ namespace DataFlowNodes {
 using BKE::VirtualNode;
 using BKE::VirtualNodeTree;
 using BKE::VirtualSocket;
+using BLI::Array;
 using BLI::ValueOrError;
 
 class VTreeDataGraph {
  private:
   VirtualNodeTree &m_vtree;
   SharedDataGraph m_graph;
-  Vector<DataSocket> m_socket_map;
+  Array<DataSocket> m_socket_map;
 
  public:
-  VTreeDataGraph(VirtualNodeTree &vtree, SharedDataGraph graph, Vector<DataSocket> mapping);
+  VTreeDataGraph(VirtualNodeTree &vtree, SharedDataGraph graph, Array<DataSocket> mapping);
 
   SharedDataGraph &graph()
   {
diff --git a/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp b/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp
index f9b62c6f979..8bcf4f2c2dc 100644
--- a/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp
@@ -51,7 +51,7 @@ std::unique_ptr<VTreeDataGraph> VTreeDataGraphBuilder::build()
 {
   auto data_graph = m_graph_builder.build();
 
-  Vector<DataSocket> r_socket_map(m_vtree.socket_count(), DataSocket::None());
+  Array<DataSocket> r_socket_map(m_vtree.socket_count(), DataSocket::None());
   for (uint vsocket_id = 0; vsocket_id < m_vtree.socket_count(); vsocket_id++) {
     BuilderSocket *socket = m_socket_map[vsocket_id];
     if (socket == nullptr) {