From: guido Date: Wed, 26 Jun 2002 12:28:55 +0000 (+0000) Subject: modifications for gcc 3.1: 1st round X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c04b22e4ee308b885c8a53c72e4c75bb5b86d44;p=dealii-svn.git modifications for gcc 3.1: 1st round git-svn-id: https://svn.dealii.org/trunk@6190 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/base/Makefile b/tests/base/Makefile index b60f5bcd69..91ee243a6f 100644 --- a/tests/base/Makefile +++ b/tests/base/Makefile @@ -20,14 +20,14 @@ default: run-tests ############################################################ -logtest.exe : logtest.go $(lib-base.g) -polynomial_test.exe: polynomial_test.go $(lib-base.g) -polynomial1d.exe : polynomial1d.go $(lib-base.g) -quadrature_test.exe: quadrature_test.go $(libraries) -reference.exe : reference.go abort.go $(libraries) -tensor.exe : tensor.go $(libraries) -timer.exe : timer.go $(libraries) -vector2d.exe : vector2d.go $(libraries) +logtest.exe : logtest.go $(lib-base.g) +polynomial_test.exe: polynomial_test.go abort.go $(lib-base.g) +polynomial1d.exe : polynomial1d.go $(lib-base.g) +quadrature_test.exe: quadrature_test.go $(libraries) +reference.exe : reference.go abort.go $(libraries) +tensor.exe : tensor.go $(libraries) +timer.exe : timer.go $(libraries) +vector2d.exe : vector2d.go $(libraries) auto_derivative_function.exe : auto_derivative_function.go $(libraries) diff --git a/tests/base/polynomial1d.cc b/tests/base/polynomial1d.cc index 6e00b697c2..89d864b0b1 100644 --- a/tests/base/polynomial1d.cc +++ b/tests/base/polynomial1d.cc @@ -46,7 +46,7 @@ int main () std::vector > p; - deallog << "Legendre" << endl; + deallog << "Legendre" << std::endl; for (unsigned int i=0;i<15;++i) p.push_back (Legendre(i)); @@ -57,7 +57,7 @@ int main () << " =" << scalar_product(p[i], p[j]) << std::endl; - deallog << "LagrangeEquidistant" << endl; + deallog << "LagrangeEquidistant" << std::endl; p.clear(); for (unsigned int i=0;i<6;++i) diff --git a/tests/base/polynomial_test.cc b/tests/base/polynomial_test.cc index ca89fec27d..976c01385a 100644 --- a/tests/base/polynomial_test.cc +++ b/tests/base/polynomial_test.cc @@ -19,21 +19,15 @@ #include #include -//using std; - -extern "C" -void abort() -{} - template void check_poly(const Point& x, const POLY& p) { const unsigned int n = p.n(); - vector values (n); - vector > gradients(n); - vector > second(n); + std::vector values (n); + std::vector > gradients(n); + std::vector > second(n); p.compute (x, values, gradients, second); @@ -50,15 +44,15 @@ void check_poly(const Point& x, for (unsigned int d1=0;d1 void -check_tensor (const vector >& v, +check_tensor (const std::vector >& v, const Point& x) { deallog.push("Tensor"); @@ -70,7 +64,7 @@ check_tensor (const vector >& v, template void -check_poly (const vector >& v, +check_poly (const std::vector >& v, const Point& x) { deallog.push("Polyno"); @@ -81,7 +75,7 @@ check_poly (const vector >& v, void -check_dimensions (const vector >& p) +check_dimensions (const std::vector >& p) { deallog.push("1d"); check_tensor(p, Point<1>(.5)); @@ -104,7 +98,7 @@ int main() deallog.attach(logfile); deallog.depth_console(0); - vector > p; + std::vector > p; for (unsigned int i=0;i<3;++i) p.push_back (LagrangeEquidistant(3, i)); diff --git a/tests/base/reference.cc b/tests/base/reference.cc index f131b7e798..a7fc66cf55 100644 --- a/tests/base/reference.cc +++ b/tests/base/reference.cc @@ -48,7 +48,7 @@ int main() std::ofstream logfile("reference.output"); deallog.attach(logfile); deallog.depth_console(0); - std::cerr = logfile; + std::cerr.rdbuf(logfile.rdbuf()); Test a("A"); const Test b("B"); SmartPointer r=&a; diff --git a/tests/deal.II/derivatives.cc b/tests/deal.II/derivatives.cc index 30ff96010c..c6cfc4f150 100644 --- a/tests/deal.II/derivatives.cc +++ b/tests/deal.II/derivatives.cc @@ -85,8 +85,8 @@ check (const unsigned int level, SparseMatrix A(A_pattern); - DoFHandler::active_cell_iterator cell = dof.begin_active(); - const DoFHandler::cell_iterator end = dof.end(); + typename DoFHandler::active_cell_iterator cell = dof.begin_active(); + const typename DoFHandler::cell_iterator end = dof.end(); for (; cell != end;++cell) { diff --git a/tests/deal.II/dof_test.cc b/tests/deal.II/dof_test.cc index 26a503fd1c..090bc73fcc 100644 --- a/tests/deal.II/dof_test.cc +++ b/tests/deal.II/dof_test.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -243,7 +243,7 @@ void TestCases::run (const unsigned int test_case) tria->begin_active()->set_refine_flag (); tria->execute_coarsening_and_refinement (); - Triangulation::active_cell_iterator cell; + typename Triangulation::active_cell_iterator cell; for (int i=0; i<(dim==2 ? 3 : 2); ++i) { // refine the presently @@ -275,7 +275,7 @@ void TestCases::run (const unsigned int test_case) tria->begin_active()->set_refine_flag(); tria->execute_coarsening_and_refinement (); - Triangulation::active_cell_iterator cell, endc; + typename Triangulation::active_cell_iterator cell, endc; for (int i=0; i<4-dim; ++i) { cell = tria->begin_active(); diff --git a/tests/deal.II/grid_test.cc b/tests/deal.II/grid_test.cc index 5934586395..ac7972e7af 100644 --- a/tests/deal.II/grid_test.cc +++ b/tests/deal.II/grid_test.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -197,7 +197,7 @@ void test (const int test_case) tria.begin_active()->set_refine_flag (); tria.execute_coarsening_and_refinement (); - Triangulation::active_cell_iterator cell; + typename Triangulation::active_cell_iterator cell; for (int i=0; i<(dim==2 ? 3 : 2); ++i) { // refine the presently @@ -234,7 +234,7 @@ void test (const int test_case) tria.begin_active()->set_refine_flag(); tria.execute_coarsening_and_refinement (); - Triangulation::active_cell_iterator cell, endc; + typename Triangulation::active_cell_iterator cell, endc; const unsigned int steps[4] = { 0, 2, 2, 2 }; for (unsigned int i=0; i{ public: TimeStepBase_Wave (); TimeStepBase_Wave (const double time, - TimeStepBase_Tria::Flags flags, + typename TimeStepBase_Tria::Flags flags, const WaveParameters ¶meters); const TimeStep_Primal & get_timestep_primal () const; const TimeStep_Dual & get_timestep_dual () const; @@ -1888,7 +1888,7 @@ void EndEnergy::compute_vectors (const PartOfDomain pod, final_u_bar.reinit (dof->n_dofs()); final_v_bar.reinit (dof->n_dofs()); - DoFHandler::active_cell_iterator cell, primal_cell, endc; + typename DoFHandler::active_cell_iterator cell, primal_cell, endc; cell = dof->begin_active (); endc = dof->end (); primal_cell = primal_dof->begin_active(); @@ -1970,7 +1970,7 @@ void IntegratedValueAtOrigin::compute_functionals (Vector &j1, j1.reinit (dof->n_dofs()); j2.reinit (dof->n_dofs()); - DoFHandler::active_cell_iterator cell = dof->begin_active(), + typename DoFHandler::active_cell_iterator cell = dof->begin_active(), endc = dof->end(); Point origin; @@ -2011,8 +2011,8 @@ void SeismicSignal::compute_functionals (Vector &j1, j1.reinit (dof->n_dofs()); j2.reinit (dof->n_dofs()); - DoFHandler::active_cell_iterator cell, endc; - DoFHandler::face_iterator face; + typename DoFHandler::active_cell_iterator cell, endc; + typename DoFHandler::face_iterator face; cell = dof->begin_active(); endc = dof->end(); @@ -2067,8 +2067,8 @@ void EarthSurface::compute_functionals (Vector &j1, j1.reinit (dof->n_dofs()); j2.reinit (dof->n_dofs()); - DoFHandler::active_cell_iterator cell, endc; - DoFHandler::face_iterator face; + typename DoFHandler::active_cell_iterator cell, endc; + typename DoFHandler::face_iterator face; cell = dof->begin_active(); endc = dof->end(); @@ -2119,8 +2119,8 @@ void SplitSignal::compute_functionals (Vector &j1, if ((time<=1.6) || (time>1.8)) return; - DoFHandler::active_cell_iterator cell, endc; - DoFHandler::face_iterator face; + typename DoFHandler::active_cell_iterator cell, endc; + typename DoFHandler::face_iterator face; cell = dof->begin_active(); endc = dof->end(); @@ -2225,7 +2225,7 @@ void OneBranch1d::compute_functionals (Vector &j1, if ((time<=2.5-time_step) || (time>2.5)) return; - DoFHandler::active_cell_iterator cell, endc; + typename DoFHandler::active_cell_iterator cell, endc; cell = dof->begin_active(); endc = dof->end(); @@ -2267,7 +2267,7 @@ void SecondCrossing::compute_functionals (Vector &j1, if ((time<=2.4-time_step) || (time>2.4)) return; - DoFHandler::active_cell_iterator cell, endc; + typename DoFHandler::active_cell_iterator cell, endc; cell = dof->begin_active(); endc = dof->end(); @@ -2310,14 +2310,14 @@ void HuyghensWave::compute_functionals (Vector &j1, p(0) = 0.75; const Point evaluation_point (p); - const DoFHandler::cell_iterator endc = dof->end(3); + const typename DoFHandler::cell_iterator endc = dof->end(3); bool point_found = false; - for (DoFHandler::cell_iterator cell=dof->begin(3); + for (typename DoFHandler::cell_iterator cell=dof->begin(3); (cell!=endc) && !point_found; ++cell) for (unsigned int vertex=0; vertex::vertices_per_cell; ++vertex) if (cell->vertex(vertex) == evaluation_point) { - DoFHandler::cell_iterator terminal_cell = cell; + typename DoFHandler::cell_iterator terminal_cell = cell; while (terminal_cell->has_children()) terminal_cell = terminal_cell->child(vertex); @@ -2438,7 +2438,7 @@ template double EvaluateEnergyContent::compute_energy (const PartOfDomain pod) const { const double y_offset = 300000000; - DoFHandler::active_cell_iterator cell, endc; + typename DoFHandler::active_cell_iterator cell, endc; cell = dof->begin_active (); endc = dof->end (); @@ -2535,7 +2535,7 @@ void EvaluateIntegratedValueAtOrigin::reset () { template double EvaluateIntegratedValueAtOrigin::evaluate () { - DoFHandler::active_cell_iterator cell = dof->begin_active(), + typename DoFHandler::active_cell_iterator cell = dof->begin_active(), endc = dof->end(); double value_at_origin = 0; @@ -2603,7 +2603,7 @@ double EvaluateSeismicSignal::evaluate () { std::ofstream out((base_file_name + ".seismic").c_str()); AssertThrow (out, typename EvaluationBase::ExcIO()); - DoFHandler::active_cell_iterator cell = dof->begin_active(), + typename DoFHandler::active_cell_iterator cell = dof->begin_active(), endc = dof->end(); double u_integrated=0; FEFaceValues face_values (*fe, *quadrature_face, @@ -2692,7 +2692,7 @@ double EvaluateSplitSignal::evaluate () { return 0; const unsigned int n_q_points = quadrature_face->n_quadrature_points; - DoFHandler::active_cell_iterator cell = dof->begin_active(), + typename DoFHandler::active_cell_iterator cell = dof->begin_active(), endc = dof->end(); double u_integrated=0; FEFaceValues face_values (*fe, *quadrature_face, UpdateFlags(update_values | update_JxW_values)); @@ -2702,7 +2702,7 @@ double EvaluateSplitSignal::evaluate () { for (unsigned int face_no=0; face_no::faces_per_cell; ++face_no) if (cell->face(face_no)->center()(0) == 1.5) { - DoFHandler::face_iterator face=cell->face(face_no); + typename DoFHandler::face_iterator face=cell->face(face_no); bool wrong_face = face->center()(1) > 0.0625; if (!wrong_face) for (unsigned int v=0; v::vertices_per_face; ++v) @@ -2907,14 +2907,14 @@ double EvaluateHuyghensWave::evaluate () p(0) = 0.75; const Point evaluation_point (p); - const DoFHandler::cell_iterator endc = dof->end(3); + const typename DoFHandler::cell_iterator endc = dof->end(3); bool point_found = false; - for (DoFHandler::cell_iterator cell=dof->begin(3); + for (typename DoFHandler::cell_iterator cell=dof->begin(3); (cell!=endc) && !point_found; ++cell) for (unsigned int vertex=0; vertex::vertices_per_cell; ++vertex) if (cell->vertex(vertex) == evaluation_point) { - DoFHandler::cell_iterator terminal_cell = cell; + typename DoFHandler::cell_iterator terminal_cell = cell; while (terminal_cell->has_children()) terminal_cell = terminal_cell->child(vertex); @@ -3775,28 +3775,28 @@ void WaveParameters::set_initial_functions (const std::string &u_name, for (unsigned int i=0; i<2; ++i) { if (names[i]=="eigenmode") - functions[i] = new InitialValues::EigenMode(); + functions[i] = new typename InitialValues::EigenMode(); else if (names[i]=="zero") functions[i] = new ZeroFunction(); else if (names[i]=="center-kink") - functions[i] = new InitialValues::CenterKink(); + functions[i] = new typename InitialValues::CenterKink(); else if (names[i]=="bump") - functions[i] = new InitialValues::Bump(); + functions[i] = new typename InitialValues::Bump(); else if (names[i]=="small bump") - functions[i] = new InitialValues::SmallBump(); + functions[i] = new typename InitialValues::SmallBump(); else if (names[i]=="shifted bump") - functions[i] = new InitialValues::ShiftedBump(); + functions[i] = new typename InitialValues::ShiftedBump(); else if (names[i]=="plateau") - functions[i] = new InitialValues::Plateau (); + functions[i] = new typename InitialValues::Plateau (); else if (names[i]=="earthquake") - functions[i] = new InitialValues::Earthquake (); + functions[i] = new typename InitialValues::Earthquake (); else AssertThrow (false, ExcUnknownName(names[i])); }; @@ -3816,13 +3816,13 @@ void WaveParameters::set_coefficient_functions (const std::string &name) { if (name=="kink") { - stiffness = new Coefficients::Kink(); + stiffness = new typename Coefficients::Kink(); stiffness_constant = false; } else if (name=="gradient") { - stiffness = new Coefficients::Gradient(); + stiffness = new typename Coefficients::Gradient(); stiffness_constant = false; } else @@ -3834,13 +3834,13 @@ void WaveParameters::set_coefficient_functions (const std::string &name) { else if (name=="preliminary earth model") { - stiffness = new Coefficients::PreliminaryEarthModel(); + stiffness = new typename Coefficients::PreliminaryEarthModel(); stiffness_constant = false; } else if (name=="distorted") { - stiffness = new Coefficients::Distorted(); + stiffness = new typename Coefficients::Distorted(); stiffness_constant = false; } else @@ -3855,26 +3855,26 @@ void WaveParameters::set_boundary_functions (const std::string &name) { if (name=="wave from left") { - boundary_values_u = new BoundaryValues::WaveFromLeft_u (); - boundary_values_v = new BoundaryValues::WaveFromLeft_v (); + boundary_values_u = new typename BoundaryValues::WaveFromLeft_u (); + boundary_values_v = new typename BoundaryValues::WaveFromLeft_v (); } else if (name=="fast wave from left") { - boundary_values_u = new BoundaryValues::FastWaveFromLeft_u (); - boundary_values_v = new BoundaryValues::FastWaveFromLeft_v (); + boundary_values_u = new typename BoundaryValues::FastWaveFromLeft_u (); + boundary_values_v = new typename BoundaryValues::FastWaveFromLeft_v (); } else if (name=="wave from left center") { - boundary_values_u = new BoundaryValues::WaveFromLeftCenter_u (); - boundary_values_v = new BoundaryValues::WaveFromLeftCenter_v (); + boundary_values_u = new typename BoundaryValues::WaveFromLeftCenter_u (); + boundary_values_v = new typename BoundaryValues::WaveFromLeftCenter_v (); } else if (name=="wave from left bottom") { - boundary_values_u = new BoundaryValues::WaveFromLeftBottom_u (); - boundary_values_v = new BoundaryValues::WaveFromLeftBottom_v (); + boundary_values_u = new typename BoundaryValues::WaveFromLeftBottom_u (); + boundary_values_v = new typename BoundaryValues::WaveFromLeftBottom_v (); } else if (name=="zero") @@ -3943,7 +3943,7 @@ void WaveParameters::set_dual_functional (const std::string &name) { dual_functional = new IntegratedValueAtOrigin (); else if (name == "seismic signature") - dual_functional = new SeismicSignal (); + dual_functional = new SeismicSignal (); else if (name == "split signal") dual_functional = new SplitSignal (); @@ -4003,7 +4003,7 @@ void WaveParameters<1>::make_coarse_grid (const std::string &name) { cells, SubCellData()); - Triangulation::active_cell_iterator cell = coarse_grid->begin_active(); + typename Triangulation::active_cell_iterator cell = coarse_grid->begin_active(); (++cell)->set_refine_flag (); (++cell)->set_refine_flag (); coarse_grid->execute_coarsening_and_refinement (); @@ -4694,7 +4694,7 @@ TimeStepBase_Wave::TimeStepBase_Wave (): template TimeStepBase_Wave::TimeStepBase_Wave (const double time, - TimeStepBase_Tria::Flags flags, + typename TimeStepBase_Tria::Flags flags, const WaveParameters ¶meters) : TimeStepBase_Tria (time, @@ -4711,7 +4711,7 @@ TimeStepBase_Wave::TimeStepBase_Wave (const double time, (parameters.refinement_strategy == WaveParameters::dual_estimator), true)), - parameters (parameters) + parameters (parameters) {}; @@ -5054,10 +5054,10 @@ void TimeStep_Wave::transfer_old_solutions (Vector &old_u, Assert (old_dof_handler != 0, ExcInternalError()); - DoFHandler::cell_iterator old_cell = old_dof_handler->begin(), + typename DoFHandler::cell_iterator old_cell = old_dof_handler->begin(), new_cell = present_dof_handler->begin(); for (; old_cell != (old_dof_handler->get_tria().n_levels() == 1 ? - static_cast::cell_iterator>(old_dof_handler->end()) : + static_cast::cell_iterator>(old_dof_handler->end()) : old_dof_handler->begin(1)); ++old_cell, new_cell) transfer_old_solutions (old_cell, new_cell, @@ -5402,7 +5402,7 @@ void TimeStep_Dual::build_rhs (Vector &right_hand_side1, Assert (previous_time_level.tria->n_cells(0) == tria->n_cells(0), typename TimeStep_Wave::ExcCoarsestGridsDiffer()); - typedef DoFHandler::cell_iterator cell_iterator; + typedef typename DoFHandler::cell_iterator cell_iterator; FEValues fe_values (fe, quadrature, UpdateFlags(update_values | @@ -5425,12 +5425,13 @@ cell_iterator old_cell = previous_time_level.dof_handler->begin(), template void -TimeStep_Dual::build_rhs (const DoFHandler::cell_iterator &old_cell, - const DoFHandler::cell_iterator &new_cell, +TimeStep_Dual::build_rhs (const typename DoFHandler::cell_iterator &old_cell, + const typename DoFHandler::cell_iterator &new_cell, FEValues &fe_values, Vector &right_hand_side1, - Vector &right_hand_side2) { - typedef DoFHandler::cell_iterator cell_iterator; + Vector &right_hand_side2) +{ + typedef typename DoFHandler::cell_iterator cell_iterator; if (old_cell->has_children() && new_cell->has_children()) { @@ -5554,7 +5555,7 @@ TimeStep_Dual::build_rhs (const DoFHandler::cell_iterator &old_cell, template unsigned int -TimeStep_Dual::collect_from_children (const DoFHandler::cell_iterator &old_cell, +TimeStep_Dual::collect_from_children (const typename DoFHandler::cell_iterator &old_cell, FEValues &fe_values, Vector &rhs1, Vector &rhs2) const { @@ -5580,7 +5581,7 @@ TimeStep_Dual::collect_from_children (const DoFHandler::cell_iterator for (unsigned int c=0; c::children_per_cell; ++c) { - const DoFHandler::cell_iterator old_child = old_cell->child(c); + const typename DoFHandler::cell_iterator old_child = old_cell->child(c); child_rhs1.clear (); child_rhs2.clear (); @@ -5647,7 +5648,7 @@ TimeStep_Dual::collect_from_children (const DoFHandler::cell_iterator template unsigned int -TimeStep_Dual::distribute_to_children (const DoFHandler::cell_iterator &new_cell, +TimeStep_Dual::distribute_to_children (const typename DoFHandler::cell_iterator &new_cell, FEValues &fe_values, const Vector &old_dof_values_u, const Vector &old_dof_values_v, @@ -5675,7 +5676,7 @@ TimeStep_Dual::distribute_to_children (const DoFHandler::cell_iterator for (unsigned int c=0; c::children_per_cell; ++c) { - const DoFHandler::cell_iterator new_child = new_cell->child(c); + const typename DoFHandler::cell_iterator new_child = new_cell->child(c); fe.prolongate(c).vmult (local_old_dof_values_u, old_dof_values_u); @@ -5907,9 +5908,9 @@ void TimeStep_ErrorEstimation::estimate_error_dual () { if (true) { - DoFHandler::active_cell_iterator + typename DoFHandler::active_cell_iterator cell = primal_problem.dof_handler->begin_active(); - const DoFHandler::active_cell_iterator + const typename DoFHandler::active_cell_iterator endc = primal_problem.dof_handler->end(); for (; cell!=endc; ++cell) cell->clear_user_pointer(); @@ -5927,12 +5928,12 @@ void TimeStep_ErrorEstimation::estimate_error_dual () { update_JxW_values | update_q_points)); - DoFHandler::cell_iterator + typename DoFHandler::cell_iterator primal_cell = primal_problem.dof_handler->begin(), dual_cell = dual_problem.dof_handler->begin(), primal_cell_old = primal_problem_old.dof_handler->begin(), dual_cell_old = dual_problem_old.dof_handler->begin(); - const DoFHandler::cell_iterator + const typename DoFHandler::cell_iterator endc = primal_problem.dof_handler->end(0); for (; primal_cell!=endc; (++primal_cell, ++dual_cell, @@ -5950,9 +5951,9 @@ void TimeStep_ErrorEstimation::estimate_error_dual () { Vector::iterator i = estimated_error_per_cell.begin(); - DoFHandler::active_cell_iterator + typename DoFHandler::active_cell_iterator cell = primal_problem.dof_handler->begin_active(); - const DoFHandler::active_cell_iterator + const typename DoFHandler::active_cell_iterator endc = primal_problem.dof_handler->end(); for (; cell!=endc; ++cell, ++i) { @@ -5970,10 +5971,10 @@ void TimeStep_ErrorEstimation::estimate_error_dual () { template void -TimeStep_ErrorEstimation::estimate_error_dual (const DoFHandler::cell_iterator &primal_cell, - const DoFHandler::cell_iterator &dual_cell, - const DoFHandler::cell_iterator &primal_cell_old, - const DoFHandler::cell_iterator &dual_cell_old, +TimeStep_ErrorEstimation::estimate_error_dual (const typename DoFHandler::cell_iterator &primal_cell, + const typename DoFHandler::cell_iterator &dual_cell, + const typename DoFHandler::cell_iterator &primal_cell_old, + const typename DoFHandler::cell_iterator &dual_cell_old, CellwiseError &cellwise_error, FEValues &fe_values) const { @@ -6125,8 +6126,8 @@ Assert (false, ExcInternalError()); template void TimeStep_ErrorEstimation:: -compute_error_on_new_children (const DoFHandler::cell_iterator &primal_cell, - const DoFHandler::cell_iterator &dual_cell, +compute_error_on_new_children (const typename DoFHandler::cell_iterator &primal_cell, + const typename DoFHandler::cell_iterator &dual_cell, const Vector &local_u_old, const Vector &local_v_old, const Vector &local_u_bar_old, @@ -6150,7 +6151,7 @@ for (unsigned int child=0; child::children_per_cell; ++child) dual_fe.prolongate(child).vmult (child_u_bar_old, local_u_bar_old); dual_fe.prolongate(child).vmult (child_v_bar_old, local_v_bar_old); - const DoFHandler::cell_iterator + const typename DoFHandler::cell_iterator new_primal_child = primal_cell->child(child), new_dual_child = dual_cell->child(child); @@ -6194,8 +6195,8 @@ for (unsigned int child=0; child::children_per_cell; ++child) template typename TimeStep_ErrorEstimation::ErrorOnCell -TimeStep_ErrorEstimation::collect_error_from_children (const DoFHandler::cell_iterator &primal_cell_old, - const DoFHandler::cell_iterator &dual_cell_old, +TimeStep_ErrorEstimation::collect_error_from_children (const typename DoFHandler::cell_iterator &primal_cell_old, + const typename DoFHandler::cell_iterator &dual_cell_old, const Vector &local_u, const Vector &local_v, const Vector &local_u_bar, @@ -6231,7 +6232,7 @@ TimeStep_ErrorEstimation::collect_error_from_children (const DoFHandler::cell_iterator + const typename DoFHandler::cell_iterator old_primal_child = primal_cell_old->child(child), old_dual_child = dual_cell_old->child(child); @@ -6287,7 +6288,7 @@ error_sum += error_formula (old_dual_child, template typename TimeStep_ErrorEstimation::ErrorOnCell -TimeStep_ErrorEstimation::error_formula (const DoFHandler::active_cell_iterator &cell, +TimeStep_ErrorEstimation::error_formula (const typename DoFHandler::active_cell_iterator &cell, const Vector &local_u, const Vector &local_v, const Vector &local_u_bar, @@ -6322,7 +6323,7 @@ TimeStep_ErrorEstimation::error_formula (const DoFHandler::active_cell template typename TimeStep_ErrorEstimation::ErrorOnCell -TimeStep_ErrorEstimation::error_formula (const DoFHandler::active_cell_iterator &cell, +TimeStep_ErrorEstimation::error_formula (const typename DoFHandler::active_cell_iterator &cell, const Vector &local_u, const Vector &local_v, const Vector &local_u_bar, @@ -7156,7 +7157,7 @@ void TimeStep_Primal::build_rhs (Vector &right_hand_side1, Assert (previous_time_level.tria->n_cells(0) == tria->n_cells(0), typename TimeStep_Wave::ExcCoarsestGridsDiffer()); - typedef DoFHandler::cell_iterator cell_iterator; + typedef typename DoFHandler::cell_iterator cell_iterator; FEValues fe_values (fe, quadrature, UpdateFlags(update_values | @@ -7179,12 +7180,12 @@ cell_iterator old_cell = previous_time_level.dof_handler->begin(), template void -TimeStep_Primal::build_rhs (const DoFHandler::cell_iterator &old_cell, - const DoFHandler::cell_iterator &new_cell, +TimeStep_Primal::build_rhs (const typename DoFHandler::cell_iterator &old_cell, + const typename DoFHandler::cell_iterator &new_cell, FEValues &fe_values, Vector &right_hand_side1, Vector &right_hand_side2) { - typedef DoFHandler::cell_iterator cell_iterator; + typedef typename DoFHandler::cell_iterator cell_iterator; if (old_cell->has_children() && new_cell->has_children()) { @@ -7310,10 +7311,11 @@ rhs1 = local_M_u; template unsigned int -TimeStep_Primal::collect_from_children (const DoFHandler::cell_iterator &old_cell, +TimeStep_Primal::collect_from_children (const typename DoFHandler::cell_iterator &old_cell, FEValues &fe_values, Vector &rhs1, - Vector &rhs2) const { + Vector &rhs2) const +{ unsigned int level_difference = 1; const TimeStep_Primal &previous_time_level @@ -7337,7 +7339,7 @@ FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); for (unsigned int c=0; c::children_per_cell; ++c) { - const DoFHandler::cell_iterator old_child = old_cell->child(c); + const typename DoFHandler::cell_iterator old_child = old_cell->child(c); child_rhs1.clear (); child_rhs2.clear (); @@ -7405,7 +7407,7 @@ FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); template unsigned int -TimeStep_Primal::distribute_to_children (const DoFHandler::cell_iterator &new_cell, +TimeStep_Primal::distribute_to_children (const typename DoFHandler::cell_iterator &new_cell, FEValues &fe_values, const Vector &old_dof_values_u, const Vector &old_dof_values_v, @@ -7433,7 +7435,7 @@ TimeStep_Primal::distribute_to_children (const DoFHandler::cell_iterat for (unsigned int c=0; c::children_per_cell; ++c) { - const DoFHandler::cell_iterator new_child = new_cell->child(c); + const typename DoFHandler::cell_iterator new_child = new_cell->child(c); fe.prolongate(c).vmult (local_old_dof_values_u, old_dof_values_u); diff --git a/tests/fe/derivatives.cc b/tests/fe/derivatives.cc index 6ba0201d92..8b8f02f327 100644 --- a/tests/fe/derivatives.cc +++ b/tests/fe/derivatives.cc @@ -31,7 +31,7 @@ plot_derivatives(Mapping& mapping, Triangulation tr; DoFHandler dof(tr); GridGenerator::hyper_cube(tr, 2., 5.); - DoFHandler::cell_iterator c = dof.begin(); + typename DoFHandler::cell_iterator c = dof.begin(); dof.distribute_dofs(finel); const unsigned int div = 1; diff --git a/tests/fe/fe_tools_test.cc b/tests/fe/fe_tools_test.cc index ab9325b2a6..2089a39031 100644 --- a/tests/fe/fe_tools_test.cc +++ b/tests/fe/fe_tools_test.cc @@ -89,9 +89,9 @@ template void test(const Triangulation &tria, const Mapping &mapping, const FiniteElement &fe1, - const string &fe_string1, + const std::string &fe_string1, const FiniteElement &fe2, - const string &fe_string2, + const std::string &fe_string2, const unsigned int testcase) { DoFHandler dof_handler1 (tria); @@ -143,13 +143,13 @@ void test(const Triangulation &tria, data_out.attach_dof_handler (dof_handler1); data_out.add_data_vector (function1, fe_string1); data_out.build_patches (2); - string file1_name=fe_string1+"_function.gnuplot"; - ofstream file1(file1_name.c_str()); + std::string file1_name=fe_string1+"_function.gnuplot"; + std::ofstream file1(file1_name.c_str()); data_out.write_gnuplot(file1); file1.close(); data_out.clear(); - string file2_name=fe_string1+"_"; + std::string file2_name=fe_string1+"_"; switch (testcase) { case 1: @@ -170,11 +170,11 @@ void test(const Triangulation &tria, default: Assert(false, ExcNotImplemented()); } - deallog << file2_name << endl; + deallog << file2_name << std::endl; data_out.build_patches (2); data_out.write_gnuplot(deallog.get_file_stream()); - ofstream file2(file2_name.c_str()); + std::ofstream file2(file2_name.c_str()); file2.setf(std::ios::showpoint | std::ios::left); data_out.write_gnuplot(file2); file2.close(); diff --git a/tests/fe/internals.cc b/tests/fe/internals.cc index f0071c1a81..ba11469ee2 100644 --- a/tests/fe/internals.cc +++ b/tests/fe/internals.cc @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -31,10 +32,10 @@ void print_formatted (const FullMatrix &A, for (unsigned int j=0; j #include #include -#include + +#ifdef HAVE_STD_STRINGSTREAM +# include +# define SSTREAM std::ostringstream +#else +# include +# define SSTREAM std::ostrstream +#endif #define PRECISION 2 @@ -31,8 +38,8 @@ template inline void plot_transformation(Mapping &mapping, FiniteElement &fe, - DoFHandler::cell_iterator &cell, - const char* name) + typename DoFHandler::cell_iterator &cell, + const std::string& name) { const unsigned int div = 7; @@ -71,8 +78,8 @@ template inline void plot_faces(Mapping &mapping, FiniteElement &fe, - DoFHandler::cell_iterator &cell, - const char* name) + typename DoFHandler::cell_iterator &cell, + const std::string& name) { deallog.push(name); @@ -115,8 +122,8 @@ template inline void plot_subfaces(Mapping &mapping, FiniteElement &fe, - DoFHandler::cell_iterator &cell, - const char* name) + typename DoFHandler::cell_iterator &cell, + const std::string& name) { deallog.push(name); @@ -162,7 +169,7 @@ inline void plot_faces(Mapping<1>&, FiniteElement<1>&, DoFHandler<1>::cell_iterator&, - const char*) + const std::string&) {}; @@ -172,7 +179,7 @@ inline void plot_subfaces(Mapping<1>&, FiniteElement<1>&, DoFHandler<1>::cell_iterator&, - const char*) + const std::string&) {}; @@ -181,7 +188,7 @@ template inline void compute_area(Mapping &mapping, FiniteElement &fe, - DoFHandler::cell_iterator &cell) + typename DoFHandler::cell_iterator &cell) { QGauss4 gauss4; FEValues fe_values(mapping, fe, gauss4, @@ -466,7 +473,7 @@ void mapping_test() { DoFHandler dof(*tria_ptr[i]); dof.distribute_dofs(fe_q4); - DoFHandler::cell_iterator cell = dof.begin_active(); + typename DoFHandler::cell_iterator cell = dof.begin_active(); deallog << "Triangulation" << i << ":" << std::endl; @@ -474,34 +481,32 @@ void mapping_test() for (unsigned int j=0; j1) { - std::ostrstream ost(st2, 99); + SSTREAM ost; ost << "MappingFace" << dim << "d-" << i << '-' - << mapping_strings[j] << std::ends; - deallog << st2 << std::endl; - plot_faces(*mapping_ptr[j], fe_q4, cell, st2); + << mapping_strings[j]; + deallog << ost.str() << std::endl; + plot_faces(*mapping_ptr[j], fe_q4, cell, ost.str()); } if (dim>1) { - std::ostrstream ost(st2, 99); + SSTREAM ost; ost << "MappingSubface" << dim << "d-" << i << '-' - << mapping_strings[j] << std::ends; - deallog << st2 << std::endl; - plot_subfaces(*mapping_ptr[j], fe_q4, cell, st2); + << mapping_strings[j]; + deallog << ost.str() << std::endl; + plot_subfaces(*mapping_ptr[j], fe_q4, cell, ost.str()); } @@ -527,9 +532,7 @@ void mapping_test() Point p_re_unit=mapping.transform_real_to_unit_cell(cell, p_real); deallog << "p_unit=" << p_unit << ", p_real=" << p_real << ", p_re_unit=" << p_re_unit << std::endl; - } - - delete[] st2; + } } } diff --git a/tests/fe/mapping_q1_eulerian.cc b/tests/fe/mapping_q1_eulerian.cc index 029b64623c..de6e29afa8 100644 --- a/tests/fe/mapping_q1_eulerian.cc +++ b/tests/fe/mapping_q1_eulerian.cc @@ -53,7 +53,7 @@ show_values(FiniteElement& fe, update_JxW_values | update_gradients | update_second_derivatives)); - DoFHandler::cell_iterator c = dof.begin(); + typename DoFHandler::cell_iterator c = dof.begin(); fe_values.reinit(c); for (unsigned int k=0; k #include #include -#include #include +#ifdef HAVE_STD_STRINGSTREAM +# include +#else +# include +#endif + template void performance (Triangulation& tr, const Mapping& mapping, diff --git a/tests/fe/shapes.cc b/tests/fe/shapes.cc index f8ccf43bcc..04091e7b3b 100644 --- a/tests/fe/shapes.cc +++ b/tests/fe/shapes.cc @@ -32,7 +32,7 @@ plot_shape_functions(Mapping& mapping, Triangulation tr; DoFHandler dof(tr); GridGenerator::hyper_cube(tr, 0., 1.); - DoFHandler::cell_iterator c = dof.begin(); + typename DoFHandler::cell_iterator c = dof.begin(); dof.distribute_dofs(finel); const unsigned int div = 11; @@ -103,7 +103,7 @@ plot_face_shape_functions(Mapping& mapping, DoFHandler dof(tr); GridGenerator::hyper_cube(tr, 0., 1.); tr.refine_global(1); - DoFHandler::active_cell_iterator c = dof.begin_active(); + typename DoFHandler::active_cell_iterator c = dof.begin_active(); ++c; c->set_refine_flag(); tr.execute_coarsening_and_refinement (); @@ -241,7 +241,7 @@ void test_compute_functions (const Mapping &mapping, FEValues fe_values(mapping, fe, q, UpdateFlags(update_values| update_gradients| update_second_derivatives)); - DoFHandler::active_cell_iterator cell = dof.begin_active(); + typename DoFHandler::active_cell_iterator cell = dof.begin_active(); fe_values.reinit(cell); bool coincide=true; diff --git a/tests/lac/block_vector.cc b/tests/lac/block_vector.cc index 5dd982fe42..24930da8a1 100644 --- a/tests/lac/block_vector.cc +++ b/tests/lac/block_vector.cc @@ -141,7 +141,7 @@ int main () logfile.precision(3); deallog.attach(logfile); deallog.depth_console(0); - std::cerr = logfile; + std::cerr.rdbuf(logfile.rdbuf()); try {