mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 06:10:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14000 from nglee:dev_FixCuda101BuildIssueMaster

Browse Source
This commit is contained in:
Alexander Alekhin 2019-03-07 20:19:50 +00:00
commit a1ef612662
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/include/opencv2/core/cvstd_wrapper.hpp
View File

@ -57,10 +57,12 @@ template <typename T, typename = void>
struct has_custom_delete
: public std::false_type {};
// Force has_custom_delete to std::false_type when NVCC is compiling CUDA source files
#ifndef __CUDACC__
template <typename T>
struct has_custom_delete<T, typename std::enable_if< sfinae::has_parenthesis_operator<DefaultDeleter<T>, void, T*>::value >::type >
: public std::true_type {};
#endif
template<typename T>
struct Ptr : public std::shared_ptr<T>