From caca744318838a6f26e620ac2264215ed51aeb44 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Fri, 5 Feb 2016 11:42:13 -0500 Subject: [PATCH] fix tests without cxx11 --- tests/hp/hp_constraints_neither_dominate_02.cc | 8 ++++---- tests/petsc/different_matrix_preconditioner.cc | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/hp/hp_constraints_neither_dominate_02.cc b/tests/hp/hp_constraints_neither_dominate_02.cc index 6905937fa8..43582bb1c7 100644 --- a/tests/hp/hp_constraints_neither_dominate_02.cc +++ b/tests/hp/hp_constraints_neither_dominate_02.cc @@ -80,7 +80,7 @@ using namespace dealii; template struct less_than_key { - inline bool operator() (const std::pair,Vector> &pair1, const std::pair,Vector> &pair2) + inline bool operator() (const std::pair,Vector > &pair1, const std::pair,Vector > &pair2) { const double precision = 1e-3; const Point &p1 = pair1.first; @@ -169,7 +169,7 @@ void test2cells(const FiniteElement &fe_0, #ifdef DEBUG_OUTPUT_VTK // output to check if all is good: counter++; - std::vector> shape_functions; + std::vector > shape_functions; std::vector names; for (unsigned int s=0; s < dof_handler.n_dofs(); s++) { @@ -193,7 +193,7 @@ void test2cells(const FiniteElement &fe_0, shape_functions.push_back(shape_function); } - DataOut> data_out; + DataOut > data_out; data_out.attach_dof_handler (dof_handler); // get material ids: @@ -234,7 +234,7 @@ void test2cells(const FiniteElement &fe_0, std::vector local_face_dof_indices; std::vector > values; - std::vector,Vector> > pairs_point_value; + std::vector,Vector > > pairs_point_value; for (typename hp::DoFHandler::active_cell_iterator cell = dof_handler.begin_active(); diff --git a/tests/petsc/different_matrix_preconditioner.cc b/tests/petsc/different_matrix_preconditioner.cc index 05135b2866..baca29b5cf 100644 --- a/tests/petsc/different_matrix_preconditioner.cc +++ b/tests/petsc/different_matrix_preconditioner.cc @@ -74,10 +74,8 @@ int main(int argc, char **argv) SparseMatrix::iterator it = A_tmp.begin(), endit = A_tmp.end(); for (; it!=endit; ++it) { - const auto row = it->row(); - const auto column = it->column(); - A.set(row, column, it->value()); - A2.set(row, column, 1000. * it->value()); // scale A2 by 1000. + A.set(it->row(), it->column(), it->value()); + A2.set(it->row(), it->column(), 1000. * it->value()); // scale A2 by 1000. } A.compress(VectorOperation::insert); A2.compress(VectorOperation::insert); -- 2.39.5