From d985861462565c3aa4ee044d22b36c9fdd74e260 Mon Sep 17 00:00:00 2001 From: "marina.kolpakova" Date: Wed, 28 Nov 2012 03:50:49 +0400 Subject: [PATCH] remove unused std imports --- modules/gpu/include/opencv2/gpu/device/emulation.hpp | 1 - modules/gpu/src/cuda/optical_flow_farneback.cu | 3 --- modules/gpu/src/nvidia/core/NCV.cu | 8 +++----- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/modules/gpu/include/opencv2/gpu/device/emulation.hpp b/modules/gpu/include/opencv2/gpu/device/emulation.hpp index 074e911..b6fba23 100644 --- a/modules/gpu/include/opencv2/gpu/device/emulation.hpp +++ b/modules/gpu/include/opencv2/gpu/device/emulation.hpp @@ -44,7 +44,6 @@ #define OPENCV_GPU_EMULATION_HPP_ #include "warp_reduce.hpp" -#include namespace cv { namespace gpu { namespace device { diff --git a/modules/gpu/src/cuda/optical_flow_farneback.cu b/modules/gpu/src/cuda/optical_flow_farneback.cu index 8231775..5bbca34 100644 --- a/modules/gpu/src/cuda/optical_flow_farneback.cu +++ b/modules/gpu/src/cuda/optical_flow_farneback.cu @@ -42,7 +42,6 @@ #if !defined CUDA_DISABLER -#include #include "internal_shared.hpp" #include "opencv2/gpu/device/common.hpp" #include "opencv2/gpu/device/border_interpolate.hpp" @@ -57,8 +56,6 @@ #define BORDER_SIZE 5 #define MAX_KSIZE_HALF 100 -using namespace std; - namespace cv { namespace gpu { namespace device { namespace optflow_farneback { __constant__ float c_g[8]; diff --git a/modules/gpu/src/nvidia/core/NCV.cu b/modules/gpu/src/nvidia/core/NCV.cu index 5d1b5d1..77e59cc 100644 --- a/modules/gpu/src/nvidia/core/NCV.cu +++ b/modules/gpu/src/nvidia/core/NCV.cu @@ -45,8 +45,6 @@ #include #include "NCV.hpp" -using namespace std; - //============================================================================== // @@ -55,16 +53,16 @@ using namespace std; //============================================================================== -static void stdDebugOutput(const string &msg) +static void stdDebugOutput(const std::string &msg) { - cout << msg; + std::cout << msg; } static NCVDebugOutputHandler *debugOutputHandler = stdDebugOutput; -void ncvDebugOutput(const string &msg) +void ncvDebugOutput(const std::string &msg) { debugOutputHandler(msg); } -- 2.7.4