From 2393a244d4ad37e447fe7e72633ec7266801a528 Mon Sep 17 00:00:00 2001 From: bangerth Date: Tue, 6 Apr 2010 03:58:59 +0000 Subject: [PATCH] Disambiguate comparison with 0 for gcc 4.5. git-svn-id: https://svn.dealii.org/trunk@20940 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/include/base/thread_management.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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; } -- 2.39.5