Skip to content

O
opencv
Commit 69f1d1dd authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #8296 from ville-v:master

parents 47c4dcc8 0c1bcf35
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
modules/core/include/opencv2/core/cvdef.h
View file @ 69f1d1dd
...@@ -438,7 +438,7 @@ Cv64suf; ...@@ -438,7 +438,7 @@ Cv64suf;
#ifdef CV_XADD #ifdef CV_XADD
// allow to use user-defined macro // allow to use user-defined macro
#elif defined __GNUC__ #elif defined __GNUC__ || defined __clang__
# if defined __clang__ && __clang_major__ >= 3 && !defined __ANDROID__ && !defined __EMSCRIPTEN__ && !defined(__CUDACC__) # if defined __clang__ && __clang_major__ >= 3 && !defined __ANDROID__ && !defined __EMSCRIPTEN__ && !defined(__CUDACC__)
# ifdef __ATOMIC_ACQ_REL # ifdef __ATOMIC_ACQ_REL
# define CV_XADD(addr, delta) __c11_atomic_fetch_add((_Atomic(int)*)(addr), delta, __ATOMIC_ACQ_REL) # define CV_XADD(addr, delta) __c11_atomic_fetch_add((_Atomic(int)*)(addr), delta, __ATOMIC_ACQ_REL)
......
modules/core/include/opencv2/core/fast_math.hpp
View file @ 69f1d1dd
...@@ -54,12 +54,14 @@ ...@@ -54,12 +54,14 @@
* fast math * * fast math *
\****************************************************************************************/ \****************************************************************************************/
#if defined __BORLANDC__ #ifdef __cplusplus
# include <fastmath.h>
#elif defined __cplusplus
# include <cmath> # include <cmath>
#else #else
# include <math.h> # ifdef __BORLANDC__
# include <fastmath.h>
# else
# include <math.h>
# endif
#endif #endif
#ifdef HAVE_TEGRA_OPTIMIZATION #ifdef HAVE_TEGRA_OPTIMIZATION
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment