From: leicht Date: Tue, 6 Feb 2007 12:46:34 +0000 (+0000) Subject: Remove the mess introduced by the effort to be backward compatible in the deal.II... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ac6e4f9cd5eef19d2bae7c261b1e08eff8a95a5;p=dealii-svn.git Remove the mess introduced by the effort to be backward compatible in the deal.II intermediate format. Wolfgang will commit a comment in the doc stating that no compatibility can be assumed. git-svn-id: https://svn.dealii.org/trunk@14415 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/source/data_out_base.cc b/deal.II/base/source/data_out_base.cc index f932787c1e..4b83c442c5 100644 --- a/deal.II/base/source/data_out_base.cc +++ b/deal.II/base/source/data_out_base.cc @@ -4133,38 +4133,7 @@ operator >> (std::istream &in, in >> patch.patch_index >> patch.n_subdivisions; - { - // we would like to use - // in >> patch.points_are_available; - // here, but in order to be compatible with - // older versions of the deal.II intermediate - // format, which did not contain this flag, - // we have to do it a bit more complicated. - - std::string line; - // eat the rest of the previous line - getline (in, line); - // now get the line that should contain the - // flag points_are_available - getline (in,line); - if (line=="1" || line=="true") - patch.points_are_available=true; - else if (line=="0" || line=="false") - patch.points_are_available=false; - else - { - // this is not the line we searched - // for, so this must be the old format, - // i.e. we have no points available - patch.points_are_available=false; - // put back the line, because it needs - // to be read in the following - in.putback('\n'); - for (int c=line.length()-1; c>=0; --c) - in.putback(line[c]); - in.putback('\n'); - } - } + in >> patch.points_are_available; unsigned int n_rows, n_cols; in >> n_rows >> n_cols;