From cbd8920f220562ee6080e98cd845ecd8adac8db4 Mon Sep 17 00:00:00 2001 From: maier Date: Thu, 18 Jul 2013 21:38:49 +0000 Subject: [PATCH] Fix wrong indentations. *sigh* astyle is not stable wrt version numbers. git-svn-id: https://svn.dealii.org/trunk@30053 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/examples/step-31/step-31.cc | 2 +- .../include/deal.II/grid/filtered_iterator.h | 2 +- .../deal.II/numerics/vector_tools.templates.h | 16 +++---- .../source/base/auto_derivative_function.cc | 2 +- deal.II/source/base/timer.cc | 48 +++++++++---------- deal.II/source/lac/trilinos_solver.cc | 6 +-- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/deal.II/examples/step-31/step-31.cc b/deal.II/examples/step-31/step-31.cc index 8b9dd103a0..e8d0062099 100644 --- a/deal.II/examples/step-31/step-31.cc +++ b/deal.II/examples/step-31/step-31.cc @@ -15,7 +15,7 @@ // --------------------------------------------------------------------- /* - * Authors: Martin Kronbichler, Uppsala University, + * Authors: Martin Kronbichler, Uppsala University, * Wolfgang Bangerth, Texas A&M University 2007, 2008 */ diff --git a/deal.II/include/deal.II/grid/filtered_iterator.h b/deal.II/include/deal.II/grid/filtered_iterator.h index 4424cda65b..c6a4c56f84 100644 --- a/deal.II/include/deal.II/grid/filtered_iterator.h +++ b/deal.II/include/deal.II/grid/filtered_iterator.h @@ -800,7 +800,7 @@ FilteredIterator (const FilteredIterator &fi) // address of fi, GCC would not cast fi to the base class of type // BaseIterator but tries to go through constructing a new // BaseIterator with an Accessor. - BaseIterator (*(BaseIterator*)(&fi)), + BaseIterator (*(BaseIterator *)(&fi)), predicate (fi.predicate->clone ()) {} diff --git a/deal.II/include/deal.II/numerics/vector_tools.templates.h b/deal.II/include/deal.II/numerics/vector_tools.templates.h index e33397e0ff..44e561fc95 100644 --- a/deal.II/include/deal.II/numerics/vector_tools.templates.h +++ b/deal.II/include/deal.II/numerics/vector_tools.templates.h @@ -543,12 +543,12 @@ namespace VectorTools */ template void project_compute_b_v (const Mapping &mapping, - const DoFHandler &dof, - const Function &function, - const bool enforce_zero_boundary, - const Quadrature &q_boundary, - const bool project_to_boundary_first, - std::map &boundary_values) + const DoFHandler &dof, + const Function &function, + const bool enforce_zero_boundary, + const Quadrature &q_boundary, + const bool project_to_boundary_first, + std::map &boundary_values) { if (enforce_zero_boundary == true) // no need to project boundary @@ -583,7 +583,7 @@ namespace VectorTools * freedom that is already constrained to something else */ bool constraints_and_b_v_are_compatible (const ConstraintMatrix &constraints, - std::map &boundary_values) + std::map &boundary_values) { for (std::map::iterator it=boundary_values.begin(); it != boundary_values.end(); ++it) @@ -624,7 +624,7 @@ namespace VectorTools // check if constraints are compatible (see below) const bool constraints_are_compatible = - constraints_and_b_v_are_compatible(constraints, boundary_values); + constraints_and_b_v_are_compatible(constraints, boundary_values); // set up mass matrix and right hand side Vector vec (dof.n_dofs()); diff --git a/deal.II/source/base/auto_derivative_function.cc b/deal.II/source/base/auto_derivative_function.cc index 7788498ea0..9c404d76e9 100644 --- a/deal.II/source/base/auto_derivative_function.cc +++ b/deal.II/source/base/auto_derivative_function.cc @@ -166,7 +166,7 @@ vector_gradient (const Point &p, Point q1, q2, q3, q4; Vector v1(this->n_components), v2(this->n_components), - v3(this->n_components), v4(this->n_components); + v3(this->n_components), v4(this->n_components); const double h_inv_12=1./(12*h); for (unsigned int i=0; i