From 1de10f9f86699355c727c59dab333d2c01803630 Mon Sep 17 00:00:00 2001 From: ville-v Date: Wed, 1 Mar 2017 08:42:14 +0200 Subject: [PATCH] Add files via upload Fix issue #8280: "fastmath.h related compile errors with Embarcadero C++ Builder 10.1" --- modules/core/include/opencv2/core/fast_math.hpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/core/include/opencv2/core/fast_math.hpp b/modules/core/include/opencv2/core/fast_math.hpp index c76936a..92c2f35 100644 --- a/modules/core/include/opencv2/core/fast_math.hpp +++ b/modules/core/include/opencv2/core/fast_math.hpp @@ -54,12 +54,14 @@ * fast math * \****************************************************************************************/ -#if defined __BORLANDC__ -# include -#elif defined __cplusplus +#ifdef __cplusplus # include #else -# include +# ifdef __BORLANDC__ +# include +# else +# include +# endif #endif #ifdef HAVE_TEGRA_OPTIMIZATION -- 2.7.4