Merge pull request #7294 from tomoaki0705:fixBuildCudaAarch64

This commit is contained in:
Alexander Alekhin 2016-09-16 14:27:18 +00:00
commit d5c202e46b

View File

@ -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