mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-11 03:33:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

android: std::exception_ptr is not available on some platforms (even with enabled C++11)

Browse Source
This commit is contained in:
Alexander Alekhin 2018-04-09 12:29:06 +03:00
parent 6a15910f0f
commit 8dacbe7584
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 #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 # define CV__EXCEPTION_PTR 1
# elif defined(CV_ICC) # elif defined(CV_ICC)
# define CV__EXCEPTION_PTR 1 # define CV__EXCEPTION_PTR 1
@ -145,7 +147,7 @@
#endif #endif
#ifndef CV__EXCEPTION_PTR #ifndef CV__EXCEPTION_PTR
# define CV__EXCEPTION_PTR 0 # define CV__EXCEPTION_PTR 0
#else #elif CV__EXCEPTION_PTR
# include <exception> // std::exception_ptr # include <exception> // std::exception_ptr
#endif #endif