]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Cast a few arguments to their correct type in the return type.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 15 Mar 2005 17:13:28 +0000 (17:13 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 15 Mar 2005 17:13:28 +0000 (17:13 +0000)
git-svn-id: https://svn.dealii.org/trunk@10155 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/source/fe/fe_tools.cc

index 0d2bf7d48d9669dd511c5d7827547a4285d50438..b3004a09f920ebfaea1f0a5e3c4e4651398c0e18 100644 (file)
@@ -1454,7 +1454,8 @@ FETools::get_fe_from_name_aux (const std::string &name)
                                       // good. so create finite
                                       // element and return position
                                       // count
-      return std::make_pair (new FE_Q_Hierarchical<dim>(tmp.first),
+      return std::make_pair (static_cast<FiniteElement<dim>*>
+                            (new FE_Q_Hierarchical<dim>(tmp.first)),
                             position);
     }
                                   // check other possibilities in
@@ -1470,7 +1471,8 @@ FETools::get_fe_from_name_aux (const std::string &name)
       position += tmp.second;
       AssertThrow (name[position] == ')', ExcInvalidFEName(name));
       ++position;
-      return std::make_pair (new FE_RaviartThomas<dim>(tmp.first),
+      return std::make_pair (static_cast<FiniteElement<dim>*>
+                            (new FE_RaviartThomas<dim>(tmp.first)),
                             position);
     }
   else if (match_at_string_start (name, std::string("FE_Nedelec")))
@@ -1484,7 +1486,8 @@ FETools::get_fe_from_name_aux (const std::string &name)
       position += tmp.second;
       AssertThrow (name[position] == ')', ExcInvalidFEName(name));
       ++position;
-      return std::make_pair (new FE_Nedelec<dim>(tmp.first),
+      return std::make_pair (static_cast<FiniteElement<dim>*>
+                            (new FE_Nedelec<dim>(tmp.first)),
                             position);
     }
   else if (match_at_string_start (name, std::string("FE_DGPNonparametric")))
@@ -1498,7 +1501,8 @@ FETools::get_fe_from_name_aux (const std::string &name)
       position += tmp.second;
       AssertThrow (name[position] == ')', ExcInvalidFEName(name));
       ++position;
-      return std::make_pair (new FE_DGPNonparametric<dim>(tmp.first),
+      return std::make_pair (static_cast<FiniteElement<dim>*>
+                            (new FE_DGPNonparametric<dim>(tmp.first)),
                             position);
     }
   else if (match_at_string_start (name, std::string("FE_DGP")))
@@ -1512,7 +1516,7 @@ FETools::get_fe_from_name_aux (const std::string &name)
       position += tmp.second;
       AssertThrow (name[position] == ')', ExcInvalidFEName(name));
       ++position;
-      return std::make_pair (new FE_DGP<dim>(tmp.first),
+      return std::make_pair (static_cast<FiniteElement<dim>*>(new FE_DGP<dim>(tmp.first)),
                             position);
     }
   else if (match_at_string_start (name, std::string("FE_DGQ")))
@@ -1526,7 +1530,7 @@ FETools::get_fe_from_name_aux (const std::string &name)
       position += tmp.second;
       AssertThrow (name[position] == ')', ExcInvalidFEName(name));
       ++position;
-      return std::make_pair (new FE_DGQ<dim>(tmp.first),
+      return std::make_pair (static_cast<FiniteElement<dim>*> (new FE_DGQ<dim>(tmp.first)),
                             position);
     }
   else if (match_at_string_start (name, std::string("FE_Q")))
@@ -1540,7 +1544,7 @@ FETools::get_fe_from_name_aux (const std::string &name)
       position += tmp.second;
       AssertThrow (name[position] == ')', ExcInvalidFEName(name));
       ++position;
-      return std::make_pair (new FE_Q<dim>(tmp.first),
+      return std::make_pair (static_cast<FiniteElement<dim>*>(new FE_Q<dim>(tmp.first)),
                             position);
     }
   

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.