]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Make the conversion constructors of the collection classes explicit.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 24 Feb 2006 16:42:34 +0000 (16:42 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 24 Feb 2006 16:42:34 +0000 (16:42 +0000)
git-svn-id: https://svn.dealii.org/trunk@12496 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/fe/fe_collection.h
deal.II/deal.II/include/fe/mapping_collection.h
deal.II/deal.II/include/fe/q_collection.h

index 7c9b5cffa6f5ed465b862ac5f5e89cb5273fa5f0..afa83671b4583e668f2e48b988d48691b91a2a64 100644 (file)
@@ -62,7 +62,7 @@ namespace hp
                                         * probably be clearer to add
                                         * all mappings the same way.
                                         */
-      FECollection (const FiniteElement<dim> &fe);
+      explicit FECollection (const FiniteElement<dim> &fe);
 
                                        /**
                                         * Copy constructor.
index 7f53a4c7de7ad7995a62435f593e2f479398aa8f..2a3da26b744e6d9ba10683b5e13fa5831834ed2f 100644 (file)
@@ -22,8 +22,6 @@
 #include <boost/shared_ptr.hpp>
 
 
-//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<dim> &mapping);
+      explicit MappingCollection (const Mapping<dim> &mapping);
 
                                        /**
                                         * Copy constructor.
index b438427ccd82f4821bbf4a69dfb997a8dab336ec..0716b270a332b18acc0d4b8002ce4a8ca27d7849 100644 (file)
 #include <boost/shared_ptr.hpp>
 
 
-//TODO[WB]: Make the conversion constructor 'explicit'. This is
-//presently calling for big trouble when doing things like
-// QGauss<dim> q;
-// hp::FEValues<dim> 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<dim> &quadrature);
+      explicit QCollection (const Quadrature<dim> &quadrature);
 
                                        /**
                                         * Copy constructor.

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.