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.

6 files changed, 15 insertions, 13 deletions

diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp
index 0161b5b192c..a50f5edb1df 100644
--- a/intern/cycles/blender/blender_python.cpp
+++ b/intern/cycles/blender/blender_python.cpp
@@ -26,6 +26,7 @@
 #include "util_md5.h"
 #include "util_opengl.h"
 #include "util_path.h"
+#include "util_string.h"
 #include "util_types.h"
 
 #ifdef WITH_OSL
@@ -437,13 +438,13 @@ static PyObject *osl_update_node_func(PyObject * /*self*/, PyObject *args)
 			continue;
 
 		/* determine socket type */
-		std::string socket_type;
+		string socket_type;
 		BL::NodeSocket::type_enum data_type = BL::NodeSocket::type_VALUE;
 		float4 default_float4 = make_float4(0.0f, 0.0f, 0.0f, 1.0f);
 		float default_float = 0.0f;
 		int default_int = 0;
-		std::string default_string = "";
-		
+		string default_string = "";
+
 		if(param->isclosure) {
 			socket_type = "NodeSocketShader";
 			data_type = BL::NodeSocket::type_SHADER;
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 */
 
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h
index b8b9597914e..9a01b4f2b6e 100644
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@ -165,7 +165,7 @@ private:
 	id_map<ParticleSystemKey, ParticleSystem> particle_system_map;
 	set<Mesh*> mesh_synced;
 	set<Mesh*> mesh_motion_synced;
-	std::set<float> motion_times;
+	set<float> motion_times;
 	void *world_map;
 	bool world_recalc;
 
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp
index 85e736ad635..909ec7a6d60 100644
--- a/intern/cycles/device/device.cpp
+++ b/intern/cycles/device/device.cpp
@@ -49,17 +49,17 @@ std::ostream& operator <<(std::ostream &os,
 	/* TODO(sergey): Decode bitflag into list of names. */
 	os << "Nodes features: " << requested_features.nodes_features << std::endl;
 	os << "Use hair: "
-	   << string_from_bool(requested_features.use_hair)  << std::endl;
+	   << string_from_bool(requested_features.use_hair) << std::endl;
 	os << "Use object motion: "
-	   << string_from_bool(requested_features.use_object_motion)  << std::endl;
+	   << string_from_bool(requested_features.use_object_motion) << std::endl;
 	os << "Use camera motion: "
-	   << string_from_bool(requested_features.use_camera_motion)  << std::endl;
+	   << string_from_bool(requested_features.use_camera_motion) << std::endl;
 	os << "Use Baking: "
-	   << string_from_bool(requested_features.use_baking)  << std::endl;
+	   << string_from_bool(requested_features.use_baking) << std::endl;
 	os << "Use Subsurface: "
 	   << string_from_bool(requested_features.use_subsurface) << std::endl;
 	os << "Use Volume: "
-	   << string_from_bool(requested_features.use_volume)  << std::endl;
+	   << string_from_bool(requested_features.use_volume) << std::endl;
 	os << "Use Branched Integrator: "
 	   << string_from_bool(requested_features.use_integrator_branched) << std::endl;
 	os << "Use Patch Evaluation: "
diff --git a/intern/cycles/graph/node_type.h b/intern/cycles/graph/node_type.h
index 60c3244028d..e89bb5b3c1f 100644
--- a/intern/cycles/graph/node_type.h
+++ b/intern/cycles/graph/node_type.h
@@ -125,8 +125,8 @@ struct NodeType
 
 	ustring name;
 	Type type;
-	std::vector<SocketType> inputs;
-	std::vector<SocketType> outputs;
+	vector<SocketType> inputs;
+	vector<SocketType> outputs;
 	CreateFunc create;
 
 	static NodeType *add(const char *name, CreateFunc create, Type type = NONE);
diff --git a/intern/cycles/render/mesh_subdivision.cpp b/intern/cycles/render/mesh_subdivision.cpp
index 813b23ed91e..913c3c74b42 100644
--- a/intern/cycles/render/mesh_subdivision.cpp
+++ b/intern/cycles/render/mesh_subdivision.cpp
@@ -92,7 +92,7 @@ namespace Far {
 
 			if(vert_edges.size() == 2) {
 				float sharpness = refiner.getLevel(0).getEdgeSharpness(vert_edges[0]);
-				sharpness = std::min(sharpness, refiner.getLevel(0).getEdgeSharpness(vert_edges[1]));
+				sharpness = min(sharpness, refiner.getLevel(0).getEdgeSharpness(vert_edges[1]));
 
 				setBaseVertexSharpness(refiner, i, sharpness);
 			}