From 0db4b7cebb7b0ee12f2814aedd35b5990f2978f4 Mon Sep 17 00:00:00 2001 From: Tomoaki Teshima Date: Fri, 16 Sep 2016 08:06:14 +0900 Subject: [PATCH] fix build error on CUDA + Aarch64 * __fp16 doesn't exist on nvcc, but it slips through ifdef guard --- modules/core/include/opencv2/core/cvdef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h index 8011c36ffa..a26cd1caf6 100644 --- a/modules/core/include/opencv2/core/cvdef.h +++ b/modules/core/include/opencv2/core/cvdef.h @@ -310,7 +310,7 @@ enum CpuFeatures { typedef union Cv16suf { short i; -#if ( defined (__arm__) || defined (__aarch64__) ) && ( defined (__GNUC__) && ( ( ( 4 <= __GNUC__ ) && ( 7 <= __GNUC__ ) ) || ( 5 <= __GNUC__ ) ) ) +#if ( defined (__arm__) || defined (__aarch64__) ) && !defined (__CUDACC__) && ( defined (__GNUC__) && ( ( ( 4 <= __GNUC__ ) && ( 7 <= __GNUC__ ) ) || ( 5 <= __GNUC__ ) ) ) __fp16 h; #endif struct _fp16Format