[Bf-blender-cvs] [6ab1d300d6b] functions: fix variable names

[Jacques Lucke]

Commit: 6ab1d300d6be20690df79090eaee89974f5b9955
Author: Jacques Lucke
Date:   Tue Jul 9 12:29:30 2019 +0200
Branches: functions
https://developer.blender.org/rB6ab1d300d6be20690df79090eaee89974f5b9955

fix variable names

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

M	source/blender/functions/core/data_flow_graph.cpp
M	source/blender/functions/core/data_flow_graph.hpp
M	source/blender/functions/core/data_flow_graph_builder.cpp
M	source/blender/functions/core/data_flow_graph_builder.hpp

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

diff --git a/source/blender/functions/core/data_flow_graph.cpp b/source/blender/functions/core/data_flow_graph.cpp
index de282559f5d..9c01afaadac 100644
--- a/source/blender/functions/core/data_flow_graph.cpp
+++ b/source/blender/functions/core/data_flow_graph.cpp
@@ -57,7 +57,7 @@ DataFlowGraph::BuildResult DataFlowGraph::FromBuilder(DataFlowGraphBuilder &buil
     }
   }
 
-  graph->m_source_info_pool = std::move(builder.m_source_info_pool);
+  graph->m_source_info_allocator = std::move(builder.m_source_info_allocator);
 
   return result;
 }
diff --git a/source/blender/functions/core/data_flow_graph.hpp b/source/blender/functions/core/data_flow_graph.hpp
index e0edabb3781..6778189afa9 100644
--- a/source/blender/functions/core/data_flow_graph.hpp
+++ b/source/blender/functions/core/data_flow_graph.hpp
@@ -182,7 +182,7 @@ class DataFlowGraph : public RefCountedBase {
   SmallVector<InputSocket> m_inputs;
   SmallVector<OutputSocket> m_outputs;
   SmallVector<uint> m_targets;
-  std::unique_ptr<MonotonicAllocator<>> m_source_info_pool;
+  std::unique_ptr<MonotonicAllocator<>> m_source_info_allocator;
 
  public:
   DataFlowGraph() = default;
diff --git a/source/blender/functions/core/data_flow_graph_builder.cpp b/source/blender/functions/core/data_flow_graph_builder.cpp
index 98f34bb9382..d6150b3cc06 100644
--- a/source/blender/functions/core/data_flow_graph_builder.cpp
+++ b/source/blender/functions/core/data_flow_graph_builder.cpp
@@ -24,13 +24,13 @@ const StringRefNull DFGB_Socket::name() const
 
 DataFlowGraphBuilder::DataFlowGraphBuilder()
 {
-  m_source_info_pool = std::unique_ptr<MonotonicAllocator<>>(new MonotonicAllocator<>());
+  m_source_info_allocator = std::unique_ptr<MonotonicAllocator<>>(new MonotonicAllocator<>());
 }
 
 DataFlowGraphBuilder::~DataFlowGraphBuilder()
 {
   /* Destruct source info if it is still owned. */
-  if (m_source_info_pool.get()) {
+  if (m_source_info_allocator.get()) {
     for (DFGB_Node *node : m_nodes) {
       if (node->source()) {
         node->source()->~SourceInfo();
@@ -45,7 +45,7 @@ DataFlowGraphBuilder::~DataFlowGraphBuilder()
 DFGB_Node *DataFlowGraphBuilder::insert_function(SharedFunction &fn, SourceInfo *source)
 {
   BLI_assert(this->is_mutable());
-  void *ptr = m_node_pool.allocate(sizeof(DFGB_Node));
+  void *ptr = m_node_allocator.allocate(sizeof(DFGB_Node));
   DFGB_Node *node = new (ptr) DFGB_Node(*this, fn, source);
   m_nodes.add_new(node);
   return node;
diff --git a/source/blender/functions/core/data_flow_graph_builder.hpp b/source/blender/functions/core/data_flow_graph_builder.hpp
index eab6f9c0a83..86224018acf 100644
--- a/source/blender/functions/core/data_flow_graph_builder.hpp
+++ b/source/blender/functions/core/data_flow_graph_builder.hpp
@@ -173,7 +173,7 @@ class DataFlowGraphBuilder {
   template<typename T, typename... Args> T *new_source_info(Args &&... args)
   {
     BLI_STATIC_ASSERT((std::is_base_of<SourceInfo, T>::value), "");
-    void *ptr = m_source_info_pool->allocate(sizeof(T));
+    void *ptr = m_source_info_allocator->allocate(sizeof(T));
     T *source = new (ptr) T(std::forward<Args>(args)...);
     return source;
   }
@@ -181,7 +181,7 @@ class DataFlowGraphBuilder {
   inline bool is_mutable() const
   {
     /* This pool is stolen as soon, as the actual graph is build. */
-    return m_source_info_pool.get() != nullptr;
+    return m_source_info_allocator.get() != nullptr;
   }
 
   std::string to_dot();
@@ -191,8 +191,8 @@ class DataFlowGraphBuilder {
   SmallSet<DFGB_Node *> m_nodes;
   SmallMap<DFGB_Socket, DFGB_Socket> m_input_origins;
   SmallMultiMap<DFGB_Socket, DFGB_Socket> m_output_targets;
-  MonotonicAllocator<sizeof(DFGB_Node) * 4> m_node_pool;
-  std::unique_ptr<MonotonicAllocator<>> m_source_info_pool;
+  MonotonicAllocator<sizeof(DFGB_Node) * 4> m_node_allocator;
+  std::unique_ptr<MonotonicAllocator<>> m_source_info_allocator;
 
   friend DFGB_Socket;
   friend DataFlowGraph;