From ec6f2e1c4dd36c2022f266d58fba1e8f7c1aaa29 Mon Sep 17 00:00:00 2001
From: Philippe FOUBERT <philippe.foubert@free.fr>
Date: Sun, 1 Dec 2013 16:41:17 +0100
Subject: [PATCH] Using cv::String instead of std::string.

---
 modules/ocl/src/cl_operations.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ocl/src/cl_operations.cpp b/modules/ocl/src/cl_operations.cpp
index e4ea151d5..802f2d80f 100644
--- a/modules/ocl/src/cl_operations.cpp
+++ b/modules/ocl/src/cl_operations.cpp
@@ -459,7 +459,7 @@ void openCLExecuteKernel(Context *ctx, const cv::ocl::ProgramEntry* source, Stri
     openCLExecuteKernel_(ctx, source, kernelName, globalThreads, localThreads, args, channels, depth,
                          build_options);
 #else
-    std::string data_type[] = { "uchar", "char", "ushort", "short", "int", "float", "double"};
+    String data_type[] = { "uchar", "char", "ushort", "short", "int", "float", "double"};
     std::cout << std::endl;
     std::cout << "Function Name: " << kernelName;
     if(depth >= 0)