generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

deleted thrust header

Browse Source
This commit is contained in:
Vladislav Vinogradov
2012-10-05 18:06:46 +04:00
parent ab3a5244ba
commit be19150672
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/gpu/include/opencv2/gpu/device/functional.hpp
View File

@@ -43,7 +43,7 @@
#ifndef __OPENCV_GPU_FUNCTIONAL_HPP__ #ifndef __OPENCV_GPU_FUNCTIONAL_HPP__
#define __OPENCV_GPU_FUNCTIONAL_HPP__ #define __OPENCV_GPU_FUNCTIONAL_HPP__
#include <thrust/functional.h> #include <functional>
#include "saturate_cast.hpp" #include "saturate_cast.hpp"
#include "vec_traits.hpp" #include "vec_traits.hpp"
#include "type_traits.hpp" #include "type_traits.hpp"
@@ -52,9 +52,8 @@
namespace cv { namespace gpu { namespace device namespace cv { namespace gpu { namespace device
{ {
// Function Objects // Function Objects
template<typename Argument, typename Result> struct unary_function : public std::unary_function<Argument, Result> {};
using thrust::unary_function; template<typename Argument1, typename Argument2, typename Result> struct binary_function : public std::binary_function<Argument1, Argument2, Result> {};
using thrust::binary_function;
// Arithmetic Operations // Arithmetic Operations
template <typename T> struct plus : binary_function<T, T, T> template <typename T> struct plus : binary_function<T, T, T>