[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57168] trunk/blender/intern/cycles/device /device_opencl.cpp: Fix windows / msvc build error.

Brecht Van Lommel brechtvanlommel at pandora.be
Sat Jun 1 04:28:59 CEST 2013


Revision: 57168
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57168
Author:   blendix
Date:     2013-06-01 02:28:57 +0000 (Sat, 01 Jun 2013)
Log Message:
-----------
Fix windows / msvc build error.

Modified Paths:
--------------
    trunk/blender/intern/cycles/device/device_opencl.cpp

Modified: trunk/blender/intern/cycles/device/device_opencl.cpp
===================================================================
--- trunk/blender/intern/cycles/device/device_opencl.cpp	2013-06-01 02:21:29 UTC (rev 57167)
+++ trunk/blender/intern/cycles/device/device_opencl.cpp	2013-06-01 02:28:57 UTC (rev 57168)
@@ -250,28 +250,28 @@
 	static cl_context get_context(cl_platform_id platform, cl_device_id device,
 		thread_scoped_lock &slot_locker)
 	{
-		return get_something(platform, device, &Slot::context, clRetainContext, slot_locker);
+		return get_something<cl_context>(platform, device, &Slot::context, clRetainContext, slot_locker);
 	}
 
 	/* see get_something comment */
 	static cl_program get_program(cl_platform_id platform, cl_device_id device,
 		thread_scoped_lock &slot_locker)
 	{
-		return get_something(platform, device, &Slot::program, clRetainProgram, slot_locker);
+		return get_something<cl_program>(platform, device, &Slot::program, clRetainProgram, slot_locker);
 	}
 
 	/* see store_something comment */
 	static void store_context(cl_platform_id platform, cl_device_id device, cl_context context,
 		thread_scoped_lock &slot_locker)
 	{
-		store_something(platform, device, context, &Slot::context, clRetainContext, slot_locker);
+		store_something<cl_context>(platform, device, context, &Slot::context, clRetainContext, slot_locker);
 	}
 
 	/* see store_something comment */
 	static void store_program(cl_platform_id platform, cl_device_id device, cl_program program,
 		thread_scoped_lock &slot_locker)
 	{
-		store_something(platform, device, program, &Slot::program, clRetainProgram, slot_locker);
+		store_something<cl_program>(platform, device, program, &Slot::program, clRetainProgram, slot_locker);
 	}
 
 	/* discard all cached contexts and programs




More information about the Bf-blender-cvs mailing list