[Bf-blender-cvs] [8128414] depsgraph_refactor: Depsgraph: Solve some compilation issues on my laptop

[Sergey Sharybin]

Commit: 81284143cc412c9db9342386ccea9f451b8af686
Author: Sergey Sharybin
Date:   Thu Nov 6 14:28:11 2014 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB81284143cc412c9db9342386ccea9f451b8af686

Depsgraph: Solve some compilation issues on my laptop

All the changes seems small but still legit to have so everyone is happy.

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

M	source/blender/depsgraph/intern/depsgraph.cpp
M	source/blender/depsgraph/intern/depsgraph_build.h
M	source/blender/depsgraph/intern/depsnode_operation.h
M	source/blender/depsgraph/util/depsgraph_util_task.h

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

diff --git a/source/blender/depsgraph/intern/depsgraph.cpp b/source/blender/depsgraph/intern/depsgraph.cpp
index d0b3fbb..3e6b1a8 100644
--- a/source/blender/depsgraph/intern/depsgraph.cpp
+++ b/source/blender/depsgraph/intern/depsgraph.cpp
@@ -99,6 +99,7 @@ static bool pointer_to_component_node_criteria(const PointerRNA *ptr, const Prop
 		Object *ob = (Object *)ptr->data;
 		/* transforms props? */
 		// ...
+		(void)ob;  /* Currently ignored. */
 	}
 	else if (RNA_struct_is_a(ptr->type, &RNA_Sequence)) {
 		Sequence *seq = (Sequence *)ptr->data;
diff --git a/source/blender/depsgraph/intern/depsgraph_build.h b/source/blender/depsgraph/intern/depsgraph_build.h
index 3ac9753..52f5df1 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.h
+++ b/source/blender/depsgraph/intern/depsgraph_build.h
@@ -272,23 +272,23 @@ struct DepsNodeHandle {
 #include "depsnode_component.h"
 
 template <class NodeType>
-static OperationDepsNode *get_entry_operation(NodeType *node)
+BLI_INLINE OperationDepsNode *get_entry_operation(NodeType *node)
 { return NULL; }
 
 template <class NodeType>
-static OperationDepsNode *get_exit_operation(NodeType *node)
+BLI_INLINE OperationDepsNode *get_exit_operation(NodeType *node)
 { return NULL; }
 
-template <> OperationDepsNode *get_entry_operation(OperationDepsNode *node)
+BLI_INLINE OperationDepsNode *get_entry_operation(OperationDepsNode *node)
 { return node; }
 
-template <> OperationDepsNode *get_exit_operation(OperationDepsNode *node)
+BLI_INLINE OperationDepsNode *get_exit_operation(OperationDepsNode *node)
 { return node; }
 
-template <> OperationDepsNode *get_entry_operation(ComponentDepsNode *node)
+BLI_INLINE OperationDepsNode *get_entry_operation(ComponentDepsNode *node)
 { return node ? node->entry_operation : NULL; }
 
-template <> OperationDepsNode *get_exit_operation(ComponentDepsNode *node)
+BLI_INLINE OperationDepsNode *get_exit_operation(ComponentDepsNode *node)
 { return node ? node->exit_operation : NULL; }
 
 template <typename KeyFrom, typename KeyTo>
diff --git a/source/blender/depsgraph/intern/depsnode_operation.h b/source/blender/depsgraph/intern/depsnode_operation.h
index 033f8df..7787586 100644
--- a/source/blender/depsgraph/intern/depsnode_operation.h
+++ b/source/blender/depsgraph/intern/depsnode_operation.h
@@ -69,7 +69,7 @@ struct OperationDepsNode : public DepsNode {
 	
 	void tag_update(Depsgraph *graph);
 	
-	bool is_noop() const { return evaluate == false; }
+	bool is_noop() const { return (bool)evaluate == false; }
 	
 	ComponentDepsNode *owner;     /* component that contains the operation */
 	
diff --git a/source/blender/depsgraph/util/depsgraph_util_task.h b/source/blender/depsgraph/util/depsgraph_util_task.h
index d1471af..858adc1 100644
--- a/source/blender/depsgraph/util/depsgraph_util_task.h
+++ b/source/blender/depsgraph/util/depsgraph_util_task.h
@@ -29,7 +29,7 @@
 
 #include "depsnode_operation.h"
 
-class Depsgraph;
+struct Depsgraph;
 struct EvaluationContext;
 struct TaskPool;