From 713d91b04e8eb5bf6416f2f51cca1442cb754008 Mon Sep 17 00:00:00 2001 From: Namgoo Lee Date: Thu, 7 Mar 2019 23:13:03 +0900 Subject: [PATCH] CUDA 10.1 Build Issue Fix on Master Branch --- modules/core/include/opencv2/core/cvstd_wrapper.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/core/include/opencv2/core/cvstd_wrapper.hpp b/modules/core/include/opencv2/core/cvstd_wrapper.hpp index a65dfd4..027639bb 100644 --- a/modules/core/include/opencv2/core/cvstd_wrapper.hpp +++ b/modules/core/include/opencv2/core/cvstd_wrapper.hpp @@ -57,10 +57,12 @@ template 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 struct has_custom_delete, void, T*>::value >::type > : public std::true_type {}; - +#endif template struct Ptr : public std::shared_ptr -- 2.7.4