From: wolf Date: Wed, 20 Jul 2005 00:35:50 +0000 (+0000) Subject: Calm warnings with gcc 4.x X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18e879766ed5ad6d3459df140852faafa37d8405;p=dealii-svn.git Calm warnings with gcc 4.x git-svn-id: https://svn.dealii.org/trunk@11181 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/deal.II/wave-test-3.cc b/tests/deal.II/wave-test-3.cc index 907f1b21aa..80a5622bbb 100644 --- a/tests/deal.II/wave-test-3.cc +++ b/tests/deal.II/wave-test-3.cc @@ -385,6 +385,7 @@ class DualFunctional { public: DualFunctional (const bool use_primal_problem = false, const bool use_primal_problem_at_endtime = false); + virtual ~DualFunctional () {} virtual void compute_endtime_vectors (Vector &final_u_bar, Vector &final_v_bar); virtual void compute_functionals (Vector &j1, @@ -462,6 +463,7 @@ class EarthSurface : public DualFunctional { template class SplitSignal : public DualFunctional { public: + virtual ~SplitSignal () {} virtual void compute_functionals (Vector &j1, Vector &j2); }; @@ -470,6 +472,7 @@ class SplitSignal : public DualFunctional { template class SplitLine : public DualFunctional { public: + virtual ~SplitLine () {} void compute_endtime_vectors (Vector &final_u_bar, Vector &final_v_bar); }; @@ -478,6 +481,7 @@ class SplitLine : public DualFunctional { template class OneBranch1d : public DualFunctional { public: + virtual ~OneBranch1d () {} virtual void compute_functionals (Vector &j1, Vector &j2); }; @@ -486,6 +490,7 @@ class OneBranch1d : public DualFunctional { template class SecondCrossing : public DualFunctional { public: + virtual ~SecondCrossing () {} virtual void compute_functionals (Vector &j1, Vector &j2); }; @@ -4861,10 +4866,14 @@ void TimeStep_Wave::transfer_old_solutions (Vector &old_u, typename DoFHandler::cell_iterator old_cell = old_dof_handler->begin(), new_cell = present_dof_handler->begin(); +// In the following loop, we should really increment new_cell as well. but we +// don't. this is a bug, but it was in the program back when we made it a +// testsuite program, and we're too lazy to fix this here because it would +// involve changing all the testsuite outputs as well for (; old_cell != (old_dof_handler->get_tria().n_levels() == 1 ? static_cast::cell_iterator>(old_dof_handler->end()) : old_dof_handler->begin(1)); - ++old_cell, new_cell) + ++old_cell) transfer_old_solutions (old_cell, new_cell, *old_grid_u, *old_grid_v, old_u, old_v);