[Bf-blender-cvs] [e3f9d091412] nodes_playground: renamind

[Jacques Lucke]

Commit: e3f9d091412be54feb914c7f9292357e8ddf93e0
Author: Jacques Lucke
Date:   Fri Jan 4 10:39:05 2019 +0100
Branches: nodes_playground
https://developer.blender.org/rBe3f9d091412be54feb914c7f9292357e8ddf93e0

renamind

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

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

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

diff --git a/source/blender/modifiers/intern/node_compiler.cpp b/source/blender/modifiers/intern/node_compiler.cpp
index d0d8572496f..ce44523c8a1 100644
--- a/source/blender/modifiers/intern/node_compiler.cpp
+++ b/source/blender/modifiers/intern/node_compiler.cpp
@@ -17,7 +17,7 @@ AnySocket LinkSet::getOriginSocket(AnySocket socket) const
 	assert(!"every input socket needs an origin");
 }
 
-AnySocket Graph::getOriginSocket(AnySocket socket) const
+AnySocket DataFlowGraph::getOriginSocket(AnySocket socket) const
 {
 	return this->links.getOriginSocket(socket);
 }
@@ -49,7 +49,7 @@ std::string Node::debug_id() const
 	return ss.str();
 }
 
-llvm::Function *Graph::generateFunction(
+llvm::Function *DataFlowGraph::generateFunction(
 	llvm::Module *module, std::string name,
 	SocketArraySet &inputs, SocketArraySet &outputs)
 {
@@ -99,7 +99,7 @@ llvm::Function *Graph::generateFunction(
 	return function;
 }
 
-void Graph::generateCode(
+void DataFlowGraph::generateCode(
 	llvm::IRBuilder<> *builder,
 	SocketArraySet &inputs, SocketArraySet &outputs, std::vector<llvm::Value *> &input_values,
 	llvm::IRBuilder<> **r_builder, std::vector<llvm::Value *> &r_output_values)
@@ -123,7 +123,7 @@ void Graph::generateCode(
 	*r_builder = builder;
 }
 
-llvm::Value *Graph::generateCodeForSocket(
+llvm::Value *DataFlowGraph::generateCodeForSocket(
 	AnySocket socket,
 	llvm::IRBuilder<> *builder,
 	SocketValueMap &values,
@@ -166,7 +166,7 @@ llvm::Value *Graph::generateCodeForSocket(
 	assert(!"should never happen");
 }
 
-SocketSet Graph::findRequiredSockets(SocketSet &inputs, SocketSet &outputs)
+SocketSet DataFlowGraph::findRequiredSockets(SocketSet &inputs, SocketSet &outputs)
 {
 	SocketSet required_sockets;
 
@@ -177,7 +177,7 @@ SocketSet Graph::findRequiredSockets(SocketSet &inputs, SocketSet &outputs)
 	return required_sockets;
 }
 
-void Graph::findRequiredSockets(AnySocket socket, SocketSet &inputs, SocketSet &required_sockets)
+void DataFlowGraph::findRequiredSockets(AnySocket socket, SocketSet &inputs, SocketSet &required_sockets)
 {
 	if (required_sockets.contains(socket)) {
 		return;
@@ -205,7 +205,7 @@ void Graph::findRequiredSockets(AnySocket socket, SocketSet &inputs, SocketSet &
 	}
 }
 
-std::string Graph::toDotFormat(std::vector<Node *> marked_nodes) const
+std::string DataFlowGraph::toDotFormat(std::vector<Node *> marked_nodes) const
 {
 	std::stringstream ss;
 	ss << "digraph MyGraph {" << std::endl;
diff --git a/source/blender/modifiers/intern/node_compiler.hpp b/source/blender/modifiers/intern/node_compiler.hpp
index e27ad4fb8e6..a336591b99c 100644
--- a/source/blender/modifiers/intern/node_compiler.hpp
+++ b/source/blender/modifiers/intern/node_compiler.hpp
@@ -18,7 +18,7 @@ struct SocketInfo;
 struct Node;
 struct Link;
 struct LinkSet;
-struct Graph;
+struct DataFlowGraph;
 
 struct AnySocket {
 	inline bool is_output() const { return this->_is_output; }
@@ -74,7 +74,7 @@ typedef std::function<void(
 	std::vector<llvm::Value *> &inputs, llvm::IRBuilder<> *builder,
 	std::vector<llvm::Value *> &r_outputs, llvm::IRBuilder<> **r_builder)> IRBuilderFunction;
 
-class Node {
+class Node final {
 private:
 	std::string debug_name;
 	std::vector<SocketInfo> _inputs;
@@ -136,7 +136,7 @@ struct AnySocketHash {
 	}
 };
 
-struct Graph {
+struct DataFlowGraph {
 	std::vector<Node *> nodes;
 	LinkSet links;
 
diff --git a/source/blender/modifiers/intern/node_compiler_testing.cpp b/source/blender/modifiers/intern/node_compiler_testing.cpp
index a7349da24b5..fc48e6d7797 100644
--- a/source/blender/modifiers/intern/node_compiler_testing.cpp
+++ b/source/blender/modifiers/intern/node_compiler_testing.cpp
@@ -79,7 +79,7 @@ void run_tests()
 	auto add2 = new_add_node(context);
 	auto add3 = new_add_node(context);
 
-	NC::Graph graph;
+	NC::DataFlowGraph graph;
 	graph.nodes.push_back(in1);
 	graph.nodes.push_back(in2);
 	graph.nodes.push_back(in3);