From: guido Date: Wed, 24 Jan 2001 20:50:24 +0000 (+0000) Subject: restored old functionality of print_formatted after std-merge caused trouble X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=177e9b69cb9918d1d59df1f3094b0e93baa9c8f0;p=dealii-svn.git restored old functionality of print_formatted after std-merge caused trouble git-svn-id: https://svn.dealii.org/trunk@3789 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/include/lac/full_matrix.templates.h b/deal.II/lac/include/lac/full_matrix.templates.h index 0ab5ded09e..68e6a34693 100644 --- a/deal.II/lac/include/lac/full_matrix.templates.h +++ b/deal.II/lac/include/lac/full_matrix.templates.h @@ -1335,7 +1335,7 @@ void FullMatrix::print_formatted (std::ostream &out, const unsigned int precision, const bool scientific, - const unsigned int width, + unsigned int width, const char *zero_string, const double denominator) const { @@ -1344,32 +1344,33 @@ FullMatrix::print_formatted (std::ostream &out, // set output format, but store old // state std::ios::fmtflags old_flags = out.flags(); + unsigned int old_precision = out.precision (precision); - unsigned int actual_width = width; if (scientific) { out.setf (std::ios::scientific, std::ios::floatfield); if (!width) - actual_width = precision+7; + width = precision+7; } else { out.setf (std::ios::fixed, std::ios::floatfield); if (!width) - actual_width = precision+2; + width = precision+2; } for (unsigned int i=0; i::print_formatted (std::ostream &out, Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); - out.precision (precision); + std::ios::fmtflags old_flags = out.flags(); + unsigned int old_precision = out.precision (precision); + if (scientific) { out.setf (std::ios::scientific, std::ios::floatfield); @@ -1051,9 +1053,9 @@ void SparseMatrix::print_formatted (std::ostream &out, }; AssertThrow (out, ExcIO()); -// see above - -// out.setf (0, std::ios::floatfield); // reset output format + // reset output format + out.precision(old_precision); + out.flags (old_flags); };