Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-10-24 13:31:11 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-10-24 13:31:11 +0300
commit80a6e5beb5be532916513025303025f961028c8d (patch)
treef1073b88efe02c1f7d6f89f25e75517f8f542972 /intern/cycles/blender/blender_shader.cpp
parent48997d2e40a74a83fb9edfb9de0999139392f634 (diff)
Cycles: Remove explicit std:: from types where possible
We have our own abstraction level on top of the STL's implementation. This commit will guarantee our tweaks are used for all cases.
Diffstat (limited to 'intern/cycles/blender/blender_shader.cpp')
-rw-r--r--intern/cycles/blender/blender_shader.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index 534bc6cc897..f63f94ab37a 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -27,12 +27,13 @@
#include "blender_util.h"
#include "util_debug.h"
+#include "util_string.h"
CCL_NAMESPACE_BEGIN
typedef map<void*, ShaderInput*> PtrInputMap;
typedef map<void*, ShaderOutput*> PtrOutputMap;
-typedef map<std::string, ConvertNode*> ProxyMap;
+typedef map<string, ConvertNode*> ProxyMap;
/* Find */