[Bf-blender-cvs] [53cf097] cycles_kernel_split: Cycles: Don't use std::set directly, use util_set instead

Sergey Sharybin noreply at git.blender.org
Mon Mar 30 17:27:13 CEST 2015


Commit: 53cf097a9f75c65007f47e2d1f6c0ad7b4ad392b
Author: Sergey Sharybin
Date:   Mon Mar 30 18:47:55 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rB53cf097a9f75c65007f47e2d1f6c0ad7b4ad392b

Cycles: Don't use std::set directly, use util_set instead

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

M	intern/cycles/device/device.h

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

diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h
index f06edf8..0fdd11f 100644
--- a/intern/cycles/device/device.h
+++ b/intern/cycles/device/device.h
@@ -23,14 +23,13 @@
 #include "device_task.h"
 
 #include "util_list.h"
+#include "util_set.h"
 #include "util_stats.h"
 #include "util_string.h"
 #include "util_thread.h"
 #include "util_types.h"
 #include "util_vector.h"
 
-#include <set>
-
 #define SPLIT_KERNEL_CLOSURE_COUNT 1
 
 CCL_NAMESPACE_BEGIN
@@ -102,7 +101,7 @@ public:
 	int clos_max;
 
 	/* Get all closure nodes associated with the scene */
-	std::set<int> closure_nodes;
+	set<int> closure_nodes;
 
 	/* regular memory */
 	virtual void mem_alloc(device_memory& mem, MemoryType type) = 0;




More information about the Bf-blender-cvs mailing list