From 3be5dd5886ef3996b928e90c284dcdf7f85be1bf Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Tue, 20 Nov 2012 15:39:35 +0000 Subject: [PATCH] Eliminate three more warnings. git-svn-id: https://svn.dealii.org/trunk@27594 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/fe/fe_tools.h | 3 ++- deal.II/source/base/mpi.cc | 1 + deal.II/source/numerics/solution_transfer.cc | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deal.II/include/deal.II/fe/fe_tools.h b/deal.II/include/deal.II/fe/fe_tools.h index 75caa20de6..71ac1114ac 100644 --- a/deal.II/include/deal.II/fe/fe_tools.h +++ b/deal.II/include/deal.II/fe/fe_tools.h @@ -1418,7 +1418,8 @@ namespace FETools << "You are using continuous elements on a grid with " << "hanging nodes but without providing hanging node " << "constraints. Use the respective function with " - << "additional ConstraintMatrix argument(s), instead."); + << "additional ConstraintMatrix argument(s), instead." + << (arg1?"":"")); /** * You need at least two grid levels. * diff --git a/deal.II/source/base/mpi.cc b/deal.II/source/base/mpi.cc index e2bbfd0f1d..616b9235e3 100644 --- a/deal.II/source/base/mpi.cc +++ b/deal.II/source/base/mpi.cc @@ -331,6 +331,7 @@ namespace Utilities // about these variables (void)argc; (void)argv; + (void)owns_mpi; #endif constructor_has_already_run = true; diff --git a/deal.II/source/numerics/solution_transfer.cc b/deal.II/source/numerics/solution_transfer.cc index c449e9384b..ed484d579f 100644 --- a/deal.II/source/numerics/solution_transfer.cc +++ b/deal.II/source/numerics/solution_transfer.cc @@ -241,7 +241,7 @@ SolutionTransfer:: prepare_for_coarsening_and_refinement(const std::vector &all_in) { Assert(prepared_for!=pure_refinement, ExcAlreadyPrepForRef()); - Assert(!prepared_for!=coarsening_and_refinement, + Assert(prepared_for!=coarsening_and_refinement, ExcAlreadyPrepForCoarseAndRef()); const unsigned int in_size=all_in.size(); -- 2.39.5