Merge pull request #11270 from alalek:parallel_for_exception_fix_android

19de675a · Vadim Pisarevsky · 8ceb6f22 · 8dacbe75 · 19de675a
Commit 19de675a authored Apr 09, 2018 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

parallel.cpp modules/core/src/parallel.cpp +4 -2

No files found.
--- a/modules/core/src/parallel.cpp
+++ b/modules/core/src/parallel.cpp
@@ -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