Commit: 708fde8d340cee5098f98617ed320e620f480535
Author: Sergey Sharybin
Date: Thu Dec 18 19:27:51 2014 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB708fde8d340cee5098f98617ed320e620f480535
Depsgraph: Move using std::vector to depsgraph_types.h
Such a generic types declarations shouldn't happen inbetween of
declaration of own stuff.
===================================================================
M source/blender/depsgraph/intern/depsgraph_types.h
M source/blender/depsgraph/intern/depsnode.h
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph_types.h
b/source/blender/depsgraph/intern/depsgraph_types.h
index 27076ce..6d4ce21 100644
--- a/source/blender/depsgraph/intern/depsgraph_types.h
+++ b/source/blender/depsgraph/intern/depsgraph_types.h
@@ -39,7 +39,10 @@
* to avoid any possible overhead caused by string (re)allocation/formatting.
*/
#include <string>
+#include <vector>
+
using std::string;
+using std::vector;
struct bAction;
struct ChannelDriver;
diff --git a/source/blender/depsgraph/intern/depsnode.h
b/source/blender/depsgraph/intern/depsnode.h
index f7a47e0..4caf843 100644
--- a/source/blender/depsgraph/intern/depsnode.h
+++ b/source/blender/depsgraph/intern/depsnode.h
@@ -27,8 +27,6 @@
#ifndef __DEPSNODE_H__
#define __DEPSNODE_H__
-#include <vector>
-
#include "MEM_guardedalloc.h"
#include "depsgraph_types.h"
@@ -103,9 +101,6 @@ struct DepsNode {
#define DEG_DEPSNODE_DEFINE(NodeType, type_, tname_) \
const DepsNode::TypeInfo NodeType::typeinfo = DepsNode::TypeInfo(type_,
tname_)
-/* TODO(sergey): Move to depsgraph_types.h. */
-using std::vector;
-
/* Generic Nodes ======================= */
struct ComponentDepsNode;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
