From b4640a483cedeb1eae82a9eee776bdab31d842cf Mon Sep 17 00:00:00 2001 From: bangerth Date: Sun, 9 Sep 2007 00:35:18 +0000 Subject: [PATCH] Remove a workaround that was necessary for 2.95 git-svn-id: https://svn.dealii.org/trunk@15175 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/grid/tria_iterator.h | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/deal.II/deal.II/include/grid/tria_iterator.h b/deal.II/deal.II/include/grid/tria_iterator.h index 2c8ab299eb..09a32e113b 100644 --- a/deal.II/deal.II/include/grid/tria_iterator.h +++ b/deal.II/deal.II/include/grid/tria_iterator.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -511,23 +511,6 @@ class TriaRawIterator : << (arg1.state() == IteratorState::valid ? "valid" : (arg1.state() == IteratorState::past_the_end ? "past_the_end" : "invalid"))); - -#ifdef DEAL_II_NESTED_CLASS_FRIEND_BUG - // the above exception class is - // supposed to report information - // about *this, but to do so it - // needs to access member - // elements of the enclosing - // class. by defect report #45 - // to the C++ standard, this is - // supposed to be allowed, but - // gcc2.95 rejects it (pre-defect - // report era), so declare the - // member class a friend. only do - // this if ./configure detected - // the necessity to do so - friend class ExcDereferenceInvalidObject; -#endif /** * Exception -- 2.39.5