From: Wolfgang Bangerth Date: Thu, 17 May 2001 11:29:01 +0000 (+0000) Subject: Fix a horribly importable place. X-Git-Tag: v8.0.0~19164 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=168c8f96304a4caeddd1cfc6650cf2145030904b;p=dealii.git Fix a horribly importable place. git-svn-id: https://svn.dealii.org/trunk@4627 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/fe_update_flags.h b/deal.II/deal.II/include/fe/fe_update_flags.h index bf1e73046c..5cbf01d3a0 100644 --- a/deal.II/deal.II/include/fe/fe_update_flags.h +++ b/deal.II/deal.II/include/fe/fe_update_flags.h @@ -207,10 +207,11 @@ enum UpdateFlags inline -UpdateFlags& +UpdateFlags & operator |= (UpdateFlags& f1, const UpdateFlags& f2) { - return ((UpdateFlags) (((int)f1) |= f2)); + f1 = static_cast (f1 | f2); + return f1; } @@ -224,10 +225,11 @@ operator | (const UpdateFlags& f1, const UpdateFlags& f2) } inline -UpdateFlags& +UpdateFlags & operator &= (UpdateFlags& f1, const UpdateFlags& f2) { - return ((UpdateFlags) (((int)f1) &= f2)); + f1 = static_cast (f1 & f2); + return f1; }