From: bangerth Date: Thu, 19 Nov 2009 01:17:26 +0000 (+0000) Subject: Add parentheses around expressions to avoid warning. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e6136e34002c610b3a17f2c2e641159979b83ef;p=dealii-svn.git Add parentheses around expressions to avoid warning. git-svn-id: https://svn.dealii.org/trunk@20134 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/contrib/tbb/tbb22_20090809oss/src/tbb/task.cpp b/deal.II/contrib/tbb/tbb22_20090809oss/src/tbb/task.cpp index 45743434a3..4815dcd596 100644 --- a/deal.II/contrib/tbb/tbb22_20090809oss/src/tbb/task.cpp +++ b/deal.II/contrib/tbb/tbb22_20090809oss/src/tbb/task.cpp @@ -1909,7 +1909,7 @@ void Governor::sign_on(GenericScheduler* s) { void Governor::sign_off(GenericScheduler* s) { if( s->is_registered ) { #if __TBB_TASK_SCHEDULER_AUTO_INIT && USE_PTHREAD - __TBB_ASSERT( theTLS.get()==s || !s->is_worker() && !theTLS.get(), "attempt to unregister a wrong scheduler instance" ); + __TBB_ASSERT( theTLS.get()==s || (!s->is_worker() && !theTLS.get()), "attempt to unregister a wrong scheduler instance" ); #else __TBB_ASSERT( theTLS.get()==s, "attempt to unregister a wrong scheduler instance" ); #endif /* __TBB_TASK_SCHEDULER_AUTO_INIT && USE_PTHREAD */ @@ -2852,7 +2852,9 @@ inline task** GenericScheduler::lock_task_pool( ArenaSlot* victim_arena_slot ) c backoff.pause(); } __TBB_ASSERT( victim_task_pool == EmptyTaskPool || - victim_arena_slot->task_pool == LockedTaskPool && victim_task_pool != LockedTaskPool, + ((victim_arena_slot->task_pool == LockedTaskPool) + && + (victim_task_pool != LockedTaskPool)), "not really locked victim's task pool?" ); return victim_task_pool; } // GenericScheduler::lock_task_pool @@ -3136,7 +3138,7 @@ inline task* GenericScheduler::get_mailbox_task() { task* result = NULL; while( task_proxy* t = inbox.pop() ) { intptr tat = __TBB_load_with_acquire(t->task_and_tag); - __TBB_ASSERT( tat==task_proxy::mailbox_bit || tat==(tat|3)&&tat!=3, NULL ); + __TBB_ASSERT( tat==task_proxy::mailbox_bit || (tat==(tat|3)&&tat!=3), NULL ); if( tat!=task_proxy::mailbox_bit && __TBB_CompareAndSwapW( &t->task_and_tag, task_proxy::pool_bit, tat )==tat ) { // Successfully grabbed the task, and left pool seeker with job of freeing the proxy. ITT_NOTIFY( sync_acquired, inbox.outbox() );