From: Wolfgang Bangerth Date: Fri, 7 Oct 2011 13:02:11 +0000 (+0000) Subject: Omit a pointless const qualifier and thereby avoid a warning by Intel's icc. X-Git-Tag: v8.0.0~3268 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60fbeeff14fffcedadf8ea7052ec109768cf29c4;p=dealii.git Omit a pointless const qualifier and thereby avoid a warning by Intel's icc. git-svn-id: https://svn.dealii.org/trunk@24552 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/fe/fe_values.cc b/deal.II/source/fe/fe_values.cc index 4c3c883283..c8bd490e43 100644 --- a/deal.II/source/fe/fe_values.cc +++ b/deal.II/source/fe/fe_values.cc @@ -1320,7 +1320,7 @@ class FEValuesBase::CellIteratorBase * conversion operator. */ virtual - operator const typename Triangulation::cell_iterator () const = 0; + operator typename Triangulation::cell_iterator () const = 0; /** * Return the number of @@ -1380,7 +1380,7 @@ class FEValuesBase::CellIterator : public FEValuesBase::cell_iterator () const; + operator typename Triangulation::cell_iterator () const; /** * Return the number of @@ -1474,7 +1474,7 @@ class FEValuesBase::TriaCellIterator : public FEValuesBase::cell_iterator () const; + operator typename Triangulation::cell_iterator () const; /** * Implement the respective @@ -1526,7 +1526,7 @@ FEValuesBase::CellIterator::CellIterator (const CI &cell) template template FEValuesBase::CellIterator:: -operator const typename Triangulation::cell_iterator () const +operator typename Triangulation::cell_iterator () const { return cell; } @@ -1571,7 +1571,7 @@ TriaCellIterator (const typename Triangulation::cell_iterator &cel template FEValuesBase::TriaCellIterator:: -operator const typename Triangulation::cell_iterator () const +operator typename Triangulation::cell_iterator () const { return cell; } @@ -1703,7 +1703,7 @@ FEValuesBase::~FEValuesBase () mapping_data=0; delete tmp1; } - + tria_listener.disconnect (); } @@ -3263,7 +3263,7 @@ maybe_invalidate_previous_present_cell (const typename Triangulationget_triangulation() != - &static_cast::cell_iterator>(*present_cell) + &static_cast::cell_iterator>(*present_cell) ->get_triangulation()) { // the triangulations for the previous cell and the current cell @@ -3273,7 +3273,7 @@ maybe_invalidate_previous_present_cell (const typename Triangulationget_triangulation().signals.any_change.connect (std_cxx1x::bind (&FEValuesBase::invalidate_present_cell, std_cxx1x::ref(static_cast&>(*this)))); @@ -3284,7 +3284,7 @@ maybe_invalidate_previous_present_cell (const typename Triangulationget_triangulation().signals.post_refinement.connect (std_cxx1x::bind (&FEValuesBase::invalidate_present_cell, std_cxx1x::ref(static_cast&>(*this))));