From 29e5171bcf5059066be87010c23ce2adea75f32e Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Sun, 1 Mar 2015 10:37:47 -0600 Subject: [PATCH] Convert Assert(...,ExcIO()) to AssertThrow(...,ExcIO()). --- source/base/data_out_base.cc | 12 ++++++------ source/base/index_set.cc | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/source/base/data_out_base.cc b/source/base/data_out_base.cc index cd72d947a7..526a883d8f 100644 --- a/source/base/data_out_base.cc +++ b/source/base/data_out_base.cc @@ -3964,7 +3964,7 @@ namespace DataOutBase const EpsFlags &flags, std::ostream &out) { - Assert (out, ExcIO()); + AssertThrow (out, ExcIO()); #ifndef DEAL_II_WITH_MPI // verify that there are indeed @@ -6488,7 +6488,7 @@ namespace DataOutBase std::pair determine_intermediate_format_dimensions (std::istream &input) { - Assert (input, ExcIO()); + AssertThrow (input, ExcIO()); unsigned int dim, spacedim; input >> dim >> spacedim; @@ -7769,7 +7769,7 @@ template void DataOutReader::read (std::istream &in) { - Assert (in, ExcIO()); + AssertThrow (in, ExcIO()); // first empty previous content { @@ -7874,7 +7874,7 @@ DataOutReader::read (std::istream &in) std_cxx11::get<2>(vector_data_ranges[i]) = name; } - Assert (in, ExcIO()); + AssertThrow (in, ExcIO()); } @@ -8016,7 +8016,7 @@ namespace DataOutBase operator >> (std::istream &in, Patch &patch) { - Assert (in, ExcIO()); + AssertThrow (in, ExcIO()); // read a header line and compare // it to what we usually @@ -8059,7 +8059,7 @@ namespace DataOutBase for (unsigned int j=0; j> patch.data[i][j]; - Assert (in, ExcIO()); + AssertThrow (in, ExcIO()); return in; } diff --git a/source/base/index_set.cc b/source/base/index_set.cc index cc2cc73522..9b9a23face 100644 --- a/source/base/index_set.cc +++ b/source/base/index_set.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2005 - 2014 by the deal.II authors +// Copyright (C) 2005 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -372,7 +372,7 @@ IndexSet::read(std::istream &in) void IndexSet::block_write(std::ostream &out) const { - Assert (out, ExcIO()); + AssertThrow (out, ExcIO()); out.write(reinterpret_cast(&index_space_size), sizeof(index_space_size)); size_t n_ranges = ranges.size(); @@ -381,7 +381,7 @@ IndexSet::block_write(std::ostream &out) const if (ranges.empty() == false) out.write (reinterpret_cast(&*ranges.begin()), ranges.size() * sizeof(Range)); - Assert (out, ExcIO()); + AssertThrow (out, ExcIO()); } void -- 2.39.5