third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11270 from alalek:parallel_for_exception_fix_android

Browse Source
This commit is contained in:
Vadim Pisarevsky 2018-04-09 13:18:38 +00:00
commit 19de675a4e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/src/parallel.cpp
View File

@ -131,7 +131,9 @@
#ifndef CV__EXCEPTION_PTR
# ifdef CV_CXX11
# if defined(__ANDROID__) && defined(ATOMIC_INT_LOCK_FREE) && ATOMIC_INT_LOCK_FREE < 2
# define CV__EXCEPTION_PTR 0 // Not supported, details: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58938
# elif defined(CV_CXX11)
# define CV__EXCEPTION_PTR 1
# elif defined(CV_ICC)
# define CV__EXCEPTION_PTR 1
@ -145,7 +147,7 @@
#endif
#ifndef CV__EXCEPTION_PTR
# define CV__EXCEPTION_PTR 0
#else
#elif CV__EXCEPTION_PTR
# include <exception> // std::exception_ptr
#endif