From: Wolfgang Bangerth Date: Tue, 6 Apr 2010 03:58:59 +0000 (+0000) Subject: Disambiguate comparison with 0 for gcc 4.5. X-Git-Tag: v8.0.0~6240 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3348e5714182be0a7b6789ac172903afa3201075;p=dealii.git Disambiguate comparison with 0 for gcc 4.5. git-svn-id: https://svn.dealii.org/trunk@20940 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/include/base/thread_management.h b/deal.II/base/include/base/thread_management.h index 6070b076fd..b74cd6e1b6 100644 --- a/deal.II/base/include/base/thread_management.h +++ b/deal.II/base/include/base/thread_management.h @@ -4083,7 +4083,9 @@ namespace Threads */ void join () const { - AssertThrow (task_descriptor != 0, ExcNoTask()); + AssertThrow (task_descriptor != + std_cxx1x::shared_ptr >(), + ExcNoTask()); task_descriptor->join (); } @@ -4113,7 +4115,9 @@ namespace Threads */ bool operator == (const Task &t) { - AssertThrow (task_descriptor != 0, ExcNoTask()); + AssertThrow (task_descriptor != + std_cxx1x::shared_ptr >(), + ExcNoTask()); return task_descriptor == t.task_descriptor; }