From: Matthias Maier Date: Thu, 19 Dec 2013 12:19:18 +0000 (+0000) Subject: Also disable the second assertion in tbb X-Git-Tag: v8.1.0~4 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1b808f6d5161993950eed63b43842fb8f65b054;p=dealii.git Also disable the second assertion in tbb git-svn-id: https://svn.dealii.org/branches/releases/Branch-8-1@32062 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/bundled/tbb41_20130401oss/src/tbb/arena.cpp b/deal.II/bundled/tbb41_20130401oss/src/tbb/arena.cpp index 3b3372cd9e..7b4f842c22 100644 --- a/deal.II/bundled/tbb41_20130401oss/src/tbb/arena.cpp +++ b/deal.II/bundled/tbb41_20130401oss/src/tbb/arena.cpp @@ -313,8 +313,8 @@ inline bool arena::may_have_tasks ( generic_scheduler* s, arena_slot& slot, bool suppress_unused_warning(slot); if ( !s ) { // This slot is vacant - __TBB_ASSERT( slot.task_pool == EmptyTaskPool, NULL ); - // Disable this assertion - 2013 maier + // Disable these assertions - 2013 maier + // __TBB_ASSERT( slot.task_pool == EmptyTaskPool, NULL ); // __TBB_ASSERT( slot.tail == slot.head, "Someone is tinkering with a vacant arena slot" ); return false; }