[Bf-blender-cvs] [68e58f1991] master: Depsgraph: Use string and vector in the DEG namespace only

[Sergey Sharybin]

Commit: 68e58f19912de679919584d295147dba541d57ba
Author: Sergey Sharybin
Date:   Thu Mar 16 12:31:19 2017 +0100
Branches: master
https://developer.blender.org/rB68e58f19912de679919584d295147dba541d57ba

Depsgraph: Use string and vector in the DEG namespace only

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

M	source/blender/depsgraph/intern/depsgraph_types.h

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

diff --git a/source/blender/depsgraph/intern/depsgraph_types.h b/source/blender/depsgraph/intern/depsgraph_types.h
index 1b57bd392c..c9c4329769 100644
--- a/source/blender/depsgraph/intern/depsgraph_types.h
+++ b/source/blender/depsgraph/intern/depsgraph_types.h
@@ -44,9 +44,6 @@
 #include <string>
 #include <vector>
 
-using std::string;
-using std::vector;
-
 struct bAction;
 struct ChannelDriver;
 struct ModifierData;
@@ -56,6 +53,9 @@ struct FCurve;
 
 namespace DEG {
 
+using std::string;
+using std::vector;
+
 /* Evaluation Operation for atomic operation */
 // XXX: move this to another header that can be exposed?
 typedef function<void(struct EvaluationContext *)> DepsEvalOperationCb;