From: Wolfgang Bangerth Date: Fri, 24 Feb 2006 16:42:34 +0000 (+0000) Subject: Make the conversion constructors of the collection classes explicit. X-Git-Tag: v8.0.0~12186 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37fe54f5b3715bcb5c67ca2289e677e9f1a442fc;p=dealii.git Make the conversion constructors of the collection classes explicit. git-svn-id: https://svn.dealii.org/trunk@12496 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/fe_collection.h b/deal.II/deal.II/include/fe/fe_collection.h index 7c9b5cffa6..afa83671b4 100644 --- a/deal.II/deal.II/include/fe/fe_collection.h +++ b/deal.II/deal.II/include/fe/fe_collection.h @@ -62,7 +62,7 @@ namespace hp * probably be clearer to add * all mappings the same way. */ - FECollection (const FiniteElement &fe); + explicit FECollection (const FiniteElement &fe); /** * Copy constructor. diff --git a/deal.II/deal.II/include/fe/mapping_collection.h b/deal.II/deal.II/include/fe/mapping_collection.h index 7f53a4c7de..2a3da26b74 100644 --- a/deal.II/deal.II/include/fe/mapping_collection.h +++ b/deal.II/deal.II/include/fe/mapping_collection.h @@ -22,8 +22,6 @@ #include -//TODO[WB]: The conversion constructor should really be 'explicit' - namespace hp { /** @@ -72,7 +70,7 @@ namespace hp * clearer to add all mappings * the same way. */ - MappingCollection (const Mapping &mapping); + explicit MappingCollection (const Mapping &mapping); /** * Copy constructor. diff --git a/deal.II/deal.II/include/fe/q_collection.h b/deal.II/deal.II/include/fe/q_collection.h index b438427ccd..0716b270a3 100644 --- a/deal.II/deal.II/include/fe/q_collection.h +++ b/deal.II/deal.II/include/fe/q_collection.h @@ -23,11 +23,6 @@ #include -//TODO[WB]: Make the conversion constructor 'explicit'. This is -//presently calling for big trouble when doing things like -// QGauss q; -// hp::FEValues fe_values(fe, q, ...); - namespace hp { /** @@ -64,7 +59,7 @@ namespace hp * probably be clearer to add * all mappings the same way. */ - QCollection (const Quadrature &quadrature); + explicit QCollection (const Quadrature &quadrature); /** * Copy constructor.