From: Wolfgang Bangerth Date: Sun, 2 Jul 2017 17:04:16 +0000 (-0600) Subject: Simplify two exceptions. X-Git-Tag: v9.0.0-rc1~1452^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fca0bed2bfb40ee26775f9611f5e010fad998095;p=dealii.git Simplify two exceptions. --- diff --git a/include/deal.II/dofs/dof_handler.h b/include/deal.II/dofs/dof_handler.h index ae3fe3df73..ef739291bc 100644 --- a/include/deal.II/dofs/dof_handler.h +++ b/include/deal.II/dofs/dof_handler.h @@ -1341,10 +1341,10 @@ void DoFHandler::load (Archive &ar, ExcMessage ("The finite element associated with this DoFHandler does not match " "the one that was associated with the DoFHandler previously stored.")); AssertThrow (policy_name == internal::policy_to_string(*policy), - ExcMessage (std::string ("The policy currently associated with this DoFHandler (") + ExcMessage ("The policy currently associated with this DoFHandler (" + internal::policy_to_string(*policy) - +std::string(") does not match the one that was associated with the " - "DoFHandler previously stored (") + + ") does not match the one that was associated with the " + "DoFHandler previously stored (" + policy_name + ").")); } diff --git a/include/deal.II/hp/dof_handler.h b/include/deal.II/hp/dof_handler.h index 1e72595cee..915d8d9f11 100644 --- a/include/deal.II/hp/dof_handler.h +++ b/include/deal.II/hp/dof_handler.h @@ -990,10 +990,10 @@ namespace hp ExcMessage ("The object being loaded into does not match the triangulation " "that has been stored previously.")); AssertThrow (policy_name == dealii::internal::policy_to_string(*policy), - ExcMessage (std::string ("The policy currently associated with this DoFHandler (") + ExcMessage ("The policy currently associated with this DoFHandler (" + dealii::internal::policy_to_string(*policy) - +std::string(") does not match the one that was associated with the " - "DoFHandler previously stored (") + + ") does not match the one that was associated with the " + "DoFHandler previously stored (" + policy_name + ").")); }