浏览代码

src: interface is a keyword in windows and cannot be used as an object name

Nathalie Furmento 13 年之前
父节点
当前提交
4350fbfab3
共有 2 个文件被更改,包括 13 次插入14 次删除
  1. 7 8
      src/core/sched_policy.c
  2. 6 6
      src/datawizard/interfaces/data_interface.c

+ 7 - 8
src/core/sched_policy.c

@@ -338,7 +338,7 @@ struct starpu_task *_starpu_create_conversion_task(starpu_data_handle_t handle,
 						   unsigned int node)
 {
 	struct starpu_task *conversion_task;
-	struct starpu_multiformat_interface *interface;
+	struct starpu_multiformat_interface *format_interface;
 	enum _starpu_node_kind node_kind;
 
 	conversion_task = starpu_task_create();
@@ -347,10 +347,9 @@ struct starpu_task *_starpu_create_conversion_task(starpu_data_handle_t handle,
 	conversion_task->buffers[0].mode = STARPU_RW;
 
 	/* The node does not really matter here */
-	interface = (struct starpu_multiformat_interface *)
-		starpu_data_get_interface_on_node(handle, 0);
+	format_interface = (struct starpu_multiformat_interface *) starpu_data_get_interface_on_node(handle, 0);
 	node_kind = _starpu_get_node_kind(node);
-	
+
 	handle->refcnt++;
 	handle->busy_count++;
 
@@ -363,12 +362,12 @@ struct starpu_task *_starpu_create_conversion_task(starpu_data_handle_t handle,
 			STARPU_ASSERT(0);
 #ifdef STARPU_USE_CUDA
 		case STARPU_CUDA_RAM:
-			conversion_task->cl = interface->ops->cuda_to_cpu_cl;
+			conversion_task->cl = format_interface->ops->cuda_to_cpu_cl;
 			break;
 #endif
 #ifdef STARPU_USE_OPENCL
 		case STARPU_OPENCL_RAM:
-			conversion_task->cl = interface->ops->opencl_to_cpu_cl;
+			conversion_task->cl = format_interface->ops->opencl_to_cpu_cl;
 			break;
 #endif
 		default:
@@ -378,12 +377,12 @@ struct starpu_task *_starpu_create_conversion_task(starpu_data_handle_t handle,
 		break;
 #if STARPU_USE_CUDA
 	case STARPU_CUDA_RAM:
-		conversion_task->cl = interface->ops->cpu_to_cuda_cl;
+		conversion_task->cl = format_interface->ops->cpu_to_cuda_cl;
 		break;
 #endif
 #if STARPU_USE_OPENCL
 	case STARPU_OPENCL_RAM:
-		conversion_task->cl = interface->ops->cpu_to_opencl_cl;
+		conversion_task->cl = format_interface->ops->cpu_to_opencl_cl;
 		break;
 #endif
 	case STARPU_SPU_LS: /* Not supported */

+ 6 - 6
src/datawizard/interfaces/data_interface.c

@@ -458,21 +458,21 @@ static void _starpu_data_unregister(starpu_data_handle_t handle, unsigned cohere
 		{
 			_STARPU_DEBUG("Conversion needed\n");
 			void *buffers[1];
-			struct starpu_multiformat_interface *interface;
-			interface = starpu_data_get_interface_on_node(handle, 0);
+			struct starpu_multiformat_interface *format_interface;
+			format_interface = starpu_data_get_interface_on_node(handle, 0);
 			struct starpu_codelet *cl;
 			enum _starpu_node_kind node_kind = _starpu_get_node_kind(handle->mf_node);
-			
+
 			switch (node_kind)
 			{
 #ifdef STARPU_USE_CUDA
 				case STARPU_CUDA_RAM:
-					cl = interface->ops->cuda_to_cpu_cl;
+					cl = format_interface->ops->cuda_to_cpu_cl;
 					break;
 #endif
 #ifdef STARPU_USE_OPENCL
 				case STARPU_OPENCL_RAM:
-					cl = interface->ops->opencl_to_cpu_cl;
+					cl = format_interface->ops->opencl_to_cpu_cl;
 					break;
 #endif
 				case STARPU_CPU_RAM:      /* Impossible ! */
@@ -480,7 +480,7 @@ static void _starpu_data_unregister(starpu_data_handle_t handle, unsigned cohere
 				default:
 					STARPU_ASSERT(0);
 			}
-			buffers[0] = interface;
+			buffers[0] = format_interface;
 			cl->cpu_func(buffers, NULL);
 		}
 	}