Merge pull request #11404 from alalek:icc_fix_std_exception_ptr

33212633 · Alexander Alekhin · bf552fdb · 39e2d64b · 33212633
Commit 33212633 authored Apr 26, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

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

No files found.
--- a/modules/core/src/parallel.cpp
+++ b/modules/core/src/parallel.cpp
@@ -135,8 +135,6 @@
 #    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
 #  elif defined(_MSC_VER)
 #    define CV__EXCEPTION_PTR (_MSC_VER >= 1600)
 #  elif defined(__clang__)