Merge pull request #14000 from nglee:dev_FixCuda101BuildIssueMaster

pull/13847/head
Alexander Alekhin 6 years ago
commit a1ef612662
  1. 4
      modules/core/include/opencv2/core/cvstd_wrapper.hpp

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

Loading…
Cancel
Save