From: bangerth Date: Thu, 25 Jan 2007 20:58:44 +0000 (+0000) Subject: Use braces to avoid a new warning in gcc 4.3. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40a335716d192ec694ac991b41714bb966976383;p=dealii-svn.git Use braces to avoid a new warning in gcc 4.3. git-svn-id: https://svn.dealii.org/trunk@14373 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/fe/hp_fe_values.cc b/deal.II/deal.II/source/fe/hp_fe_values.cc index c80396fd44..604d9839be 100644 --- a/deal.II/deal.II/source/fe/hp_fe_values.cc +++ b/deal.II/deal.II/source/fe/hp_fe_values.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2003, 2006 by the deal.II authors +// Copyright (C) 2003, 2006, 2007 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -150,17 +150,21 @@ namespace hp real_fe_index = fe_index; if (real_q_index == deal_II_numbers::invalid_unsigned_int) - if (this->q_collection.size() > 1) - real_q_index = cell->active_fe_index(); - else - real_q_index = 0; + { + if (this->q_collection.size() > 1) + real_q_index = cell->active_fe_index(); + else + real_q_index = 0; + } if (real_mapping_index == deal_II_numbers::invalid_unsigned_int) - if (this->mapping_collection->size() > 1) - real_mapping_index = cell->active_fe_index(); - else - real_mapping_index = 0; - + { + if (this->mapping_collection->size() > 1) + real_mapping_index = cell->active_fe_index(); + else + real_mapping_index = 0; + } + if (real_fe_index == deal_II_numbers::invalid_unsigned_int) real_fe_index = cell->active_fe_index(); @@ -343,17 +347,21 @@ namespace hp real_fe_index = fe_index; if (real_q_index == deal_II_numbers::invalid_unsigned_int) - if (this->q_collection.size() > 1) - real_q_index = cell->active_fe_index(); - else - real_q_index = 0; + { + if (this->q_collection.size() > 1) + real_q_index = cell->active_fe_index(); + else + real_q_index = 0; + } if (real_mapping_index == deal_II_numbers::invalid_unsigned_int) - if (this->mapping_collection->size() > 1) - real_mapping_index = cell->active_fe_index(); - else - real_mapping_index = 0; - + { + if (this->mapping_collection->size() > 1) + real_mapping_index = cell->active_fe_index(); + else + real_mapping_index = 0; + } + if (real_fe_index == deal_II_numbers::invalid_unsigned_int) real_fe_index = cell->active_fe_index(); @@ -540,17 +548,21 @@ namespace hp real_fe_index = fe_index; if (real_q_index == deal_II_numbers::invalid_unsigned_int) - if (this->q_collection.size() > 1) - real_q_index = cell->active_fe_index(); - else - real_q_index = 0; + { + if (this->q_collection.size() > 1) + real_q_index = cell->active_fe_index(); + else + real_q_index = 0; + } if (real_mapping_index == deal_II_numbers::invalid_unsigned_int) - if (this->mapping_collection->size() > 1) - real_mapping_index = cell->active_fe_index(); - else - real_mapping_index = 0; - + { + if (this->mapping_collection->size() > 1) + real_mapping_index = cell->active_fe_index(); + else + real_mapping_index = 0; + } + if (real_fe_index == deal_II_numbers::invalid_unsigned_int) real_fe_index = cell->active_fe_index();