Merge pull request #7294 from tomoaki0705:fixBuildCudaAarch64

9 years ago · d5c202e46b
parent fb912e1ba7 0db4b7cebb
commit d5c202e46b
1 changed files with 1 additions and 1 deletions
--- 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