[Bf-blender-cvs] [611d7d96de9] nodes_playground: cleanup iterator

[Jacques Lucke]

Commit: 611d7d96de99d1c2bfe677f19d2c257832f7b70e
Author: Jacques Lucke
Date:   Sat Jan 5 12:10:28 2019 +0100
Branches: nodes_playground
https://developer.blender.org/rB611d7d96de99d1c2bfe677f19d2c257832f7b70e

cleanup iterator

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

M	source/blender/modifiers/intern/ArraySet.hpp
M	source/blender/modifiers/intern/node_compiler.cpp

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

diff --git a/source/blender/modifiers/intern/ArraySet.hpp b/source/blender/modifiers/intern/ArraySet.hpp
index e3455186a7e..5e6684a162a 100644
--- a/source/blender/modifiers/intern/ArraySet.hpp
+++ b/source/blender/modifiers/intern/ArraySet.hpp
@@ -5,9 +5,11 @@ template<typename T>
 class
 ArraySet {
 private:
-    std::vector<T> entries;
+    using entries_t = std::vector<T>;
+    entries_t entries;
 
 public:
+    using const_iterator = typename entries_t::const_iterator;
 
     ArraySet() {};
 
@@ -41,11 +43,6 @@ public:
         return false;
     }
 
-    const std::vector<T> &elements() const
-    {
-        return this->entries;
-    }
-
     T operator[](const int index) const
     {
         assert(index >= 0 && index < this->size());
@@ -56,4 +53,9 @@ public:
     {
         return this->entries.size();
     }
+
+    const_iterator begin()
+    { return this->entries.begin(); }
+    const_iterator end()
+    { return this->entries.end(); }
 };
\ No newline at end of file
diff --git a/source/blender/modifiers/intern/node_compiler.cpp b/source/blender/modifiers/intern/node_compiler.cpp
index 91d78d266c8..740292c4efd 100644
--- a/source/blender/modifiers/intern/node_compiler.cpp
+++ b/source/blender/modifiers/intern/node_compiler.cpp
@@ -106,12 +106,12 @@ llvm::Function *DataFlowGraph::generateFunction(
 	llvm::LLVMContext &context = module->getContext();
 
 	std::vector<llvm::Type *> input_types;
-	for (AnySocket socket : inputs.elements()) {
+	for (AnySocket socket : inputs) {
 		input_types.push_back(socket.type()->getLLVMType(context));
 	}
 
 	std::vector<llvm::Type *> output_types;
-	for (AnySocket socket : outputs.elements()) {
+	for (AnySocket socket : outputs) {
 		output_types.push_back(socket.type()->getLLVMType(context));
 	}
 
@@ -161,7 +161,7 @@ void DataFlowGraph::generateCode(
 		values.add(inputs[i], input_values[i]);
 	}
 
-	for (AnySocket socket : outputs.elements()) {
+	for (AnySocket socket : outputs) {
 		llvm::IRBuilder<> *next_builder;
 
 		llvm::Value *value = this->generateCodeForSocket(socket, builder, values, &next_builder);
@@ -220,7 +220,7 @@ SocketSet DataFlowGraph::findRequiredSockets(SocketSet &inputs, SocketSet &outpu
 {
 	SocketSet required_sockets;
 
-	for (AnySocket socket : outputs.elements()) {
+	for (AnySocket socket : outputs) {
 		this->findRequiredSockets(socket, inputs, required_sockets);
 	}