From f384b91fbdfa2860a93df7e57168d71ed9cf6640 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 15 Mar 2005 17:13:28 +0000 Subject: [PATCH] Cast a few arguments to their correct type in the return type. git-svn-id: https://svn.dealii.org/trunk@10155 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/fe/fe_tools.cc | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/deal.II/deal.II/source/fe/fe_tools.cc b/deal.II/deal.II/source/fe/fe_tools.cc index 0d2bf7d48d..b3004a09f9 100644 --- a/deal.II/deal.II/source/fe/fe_tools.cc +++ b/deal.II/deal.II/source/fe/fe_tools.cc @@ -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(tmp.first), + return std::make_pair (static_cast*> + (new FE_Q_Hierarchical(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(tmp.first), + return std::make_pair (static_cast*> + (new FE_RaviartThomas(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(tmp.first), + return std::make_pair (static_cast*> + (new FE_Nedelec(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(tmp.first), + return std::make_pair (static_cast*> + (new FE_DGPNonparametric(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(tmp.first), + return std::make_pair (static_cast*>(new FE_DGP(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(tmp.first), + return std::make_pair (static_cast*> (new FE_DGQ(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(tmp.first), + return std::make_pair (static_cast*>(new FE_Q(tmp.first)), position); } -- 2.39.5