From 36bfa6ea1cf71749a2fa61de9a14570a9ba4788f Mon Sep 17 00:00:00 2001
From: Vladislav Vinogradov <no@email>
Date: Tue, 9 Aug 2011 09:15:04 +0000
Subject: [PATCH] minor

---
 modules/gpu/src/cuda/canny.cu       | 3 ++-
 modules/gpu/src/cuda/filters.cu     | 5 +----
 modules/gpu/src/cuda/split_merge.cu | 1 -
 modules/gpu/src/cuda/stereobp.cu    | 3 +--
 modules/gpu/src/cuda/stereocsbp.cu  | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/modules/gpu/src/cuda/canny.cu b/modules/gpu/src/cuda/canny.cu
index 5a7a868fa9..b2acae9711 100644
--- a/modules/gpu/src/cuda/canny.cu
+++ b/modules/gpu/src/cuda/canny.cu
@@ -40,6 +40,7 @@
 //
 //M*/
 
+#include <utility>
 #include "internal_shared.hpp"
 #include "opencv2/gpu/device/utility.hpp"
 
@@ -463,7 +464,7 @@ namespace cv { namespace gpu { namespace canny
 
             cudaSafeCall( cudaMemcpy(&count, counter_ptr, sizeof(unsigned int), cudaMemcpyDeviceToHost) );
 
-            swap(st1, st2);
+            std::swap(st1, st2);
         }
     }
 
diff --git a/modules/gpu/src/cuda/filters.cu b/modules/gpu/src/cuda/filters.cu
index 9ca2825a5b..fd67fb9611 100644
--- a/modules/gpu/src/cuda/filters.cu
+++ b/modules/gpu/src/cuda/filters.cu
@@ -40,15 +40,12 @@
 //
 //M*/
 
-#include "opencv2/gpu/devmem2d.hpp"
+#include "internal_shared.hpp"
 #include "opencv2/gpu/device/saturate_cast.hpp"
 #include "opencv2/gpu/device/vec_math.hpp"
 #include "opencv2/gpu/device/limits.hpp"
 #include "opencv2/gpu/device/border_interpolate.hpp"
 
-#include "safe_call.hpp"
-#include "internal_shared.hpp"
-
 using namespace cv::gpu;
 using namespace cv::gpu::device;
 
diff --git a/modules/gpu/src/cuda/split_merge.cu b/modules/gpu/src/cuda/split_merge.cu
index e618ff8f13..1f5ad73e81 100644
--- a/modules/gpu/src/cuda/split_merge.cu
+++ b/modules/gpu/src/cuda/split_merge.cu
@@ -40,7 +40,6 @@
 //
 //M*/
 
-#include "opencv2/gpu/devmem2d.hpp"
 #include "internal_shared.hpp"
 
 namespace cv { namespace gpu { namespace split_merge {
diff --git a/modules/gpu/src/cuda/stereobp.cu b/modules/gpu/src/cuda/stereobp.cu
index 6d1a5f4bed..e0f5fd4069 100644
--- a/modules/gpu/src/cuda/stereobp.cu
+++ b/modules/gpu/src/cuda/stereobp.cu
@@ -40,10 +40,9 @@
 //
 //M*/
 
-#include "opencv2/gpu/devmem2d.hpp"
+#include "internal_shared.hpp"
 #include "opencv2/gpu/device/saturate_cast.hpp"
 #include "opencv2/gpu/device/limits.hpp"
-#include "safe_call.hpp"
 
 using namespace cv::gpu;
 using namespace cv::gpu::device;
diff --git a/modules/gpu/src/cuda/stereocsbp.cu b/modules/gpu/src/cuda/stereocsbp.cu
index 5ed8938e03..f3f0680db9 100644
--- a/modules/gpu/src/cuda/stereocsbp.cu
+++ b/modules/gpu/src/cuda/stereocsbp.cu
@@ -40,10 +40,9 @@
 //
 //M*/
 
-#include "opencv2/gpu/devmem2d.hpp"
+#include "internal_shared.hpp"
 #include "opencv2/gpu/device/saturate_cast.hpp"
 #include "opencv2/gpu/device/limits.hpp"
-#include "safe_call.hpp"
 
 using namespace cv::gpu;
 using namespace cv::gpu::device;
-- 
GitLab