Merge pull request #8494 from tomoaki0705:fixWarningCuda

8 years ago · b67382cbeb
parent 1c53595817 507071cc6f
commit b67382cbeb
1 changed files with 1 additions and 1 deletions
--- a/modules/core/include/opencv2/core/fast_math.hpp
+++ b/modules/core/include/opencv2/core/fast_math.hpp
@ -74,7 +74,7 @@
 #  include "tegra_round.hpp"
 #endif

-#if defined __GNUC__ && defined __arm__ && (defined __ARM_PCS_VFP || defined __ARM_VFPV3__ || defined __ARM_NEON__) && !defined __SOFTFP__
+#if defined __GNUC__ && defined __arm__ && (defined __ARM_PCS_VFP || defined __ARM_VFPV3__ || defined __ARM_NEON__) && !defined __SOFTFP__ && !defined(__CUDACC__)
    // 1. general scheme
    #define ARM_ROUND(_value, _asm_string) \
        int res; \