Merge pull request #7294 from tomoaki0705:fixBuildCudaAarch64

d5c202e4 · Alexander Alekhin · fb912e1b · 0db4b7ce · d5c202e4
Commit d5c202e4 authored Sep 16, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cvdef.h modules/core/include/opencv2/core/cvdef.h +1 -1

No files found.
--- 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