From 743ff9df44ee32a58df0afac1ab39aa079915dc1 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 30 Apr 2013 16:21:59 +0000 Subject: [PATCH] Fix accidental checkin of merge conflict marker :-( git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29411 0785d39b-7218-0410-832d-ea1e28bc413d --- .../deal.II/lac/full_matrix.templates.h | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/deal.II/include/deal.II/lac/full_matrix.templates.h b/deal.II/include/deal.II/lac/full_matrix.templates.h index a0bbe2ef1f..39a2d461fc 100644 --- a/deal.II/include/deal.II/lac/full_matrix.templates.h +++ b/deal.II/include/deal.II/lac/full_matrix.templates.h @@ -744,27 +744,13 @@ void FullMatrix::mTmult (FullMatrix &dst, const size_type m = this->m(), n = src.m(), l = this->n(); -<<<<<<< .working - // arrange the loops in a way that - // we keep write operations low, - // (writing is usually more costly - // than reading). - for (size_type i=0; i::mTmult (FullMatrix &dst, else // arrange the loops in a way that we keep write operations low, (writing is // usually more costly than reading). - for (unsigned int i=0; i>>>>>> .merge-right.r29408 } -- 2.39.5