From 968c09540323edc040cebf3a7759c756aeea081f Mon Sep 17 00:00:00 2001
From: ilya-lavrenov <ilya.lavrenov@itseez.com>
Date: Thu, 29 Aug 2013 15:55:53 +0400
Subject: [PATCH] gpu -> ocl

---
 modules/ocl/include/opencv2/ocl/matrix_operations.hpp | 6 +++---
 modules/ocl/include/opencv2/ocl/ocl.hpp               | 2 +-
 modules/ocl/src/precomp.hpp                           | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/ocl/include/opencv2/ocl/matrix_operations.hpp b/modules/ocl/include/opencv2/ocl/matrix_operations.hpp
index 55f2fc9fa1..47932075cd 100644
--- a/modules/ocl/include/opencv2/ocl/matrix_operations.hpp
+++ b/modules/ocl/include/opencv2/ocl/matrix_operations.hpp
@@ -41,8 +41,8 @@
 //
 //M*/
 
-#ifndef __OPENCV_GPU_MATRIX_OPERATIONS_HPP__
-#define __OPENCV_GPU_MATRIX_OPERATIONS_HPP__
+#ifndef __OPENCV_OCL_MATRIX_OPERATIONS_HPP__
+#define __OPENCV_OCL_MATRIX_OPERATIONS_HPP__
 
 namespace cv
 {
@@ -514,4 +514,4 @@ namespace cv
 
 } /* end of namespace cv */
 
-#endif /* __OPENCV_GPU_MATRIX_OPERATIONS_HPP__ */
+#endif /* __OPENCV_OCL_MATRIX_OPERATIONS_HPP__ */
diff --git a/modules/ocl/include/opencv2/ocl/ocl.hpp b/modules/ocl/include/opencv2/ocl/ocl.hpp
index 5b3642d034..d12e1ac4ba 100644
--- a/modules/ocl/include/opencv2/ocl/ocl.hpp
+++ b/modules/ocl/include/opencv2/ocl/ocl.hpp
@@ -1709,4 +1709,4 @@ namespace cv
 #  pragma warning( pop)
 #endif
 
-#endif /* __OPENCV_GPU_HPP__ */
+#endif /* __OPENCV_OCL_HPP__ */
diff --git a/modules/ocl/src/precomp.hpp b/modules/ocl/src/precomp.hpp
index 8050b909b7..a50ab900ab 100644
--- a/modules/ocl/src/precomp.hpp
+++ b/modules/ocl/src/precomp.hpp
@@ -70,7 +70,6 @@
 #include "opencv2/ocl/ocl.hpp"
 
 #include "opencv2/core/internal.hpp"
-//#include "opencv2/highgui/highgui.hpp"
 
 #define __ATI__
 
-- 
GitLab