From 5f86e54566c74b847f46345b2ae6e74c68b524cd Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 26 Mar 2002 08:11:03 +0000 Subject: [PATCH] Remove some cruft from pre-2.95 times, and declare the proper classes friends. git-svn-id: https://svn.dealii.org/trunk@5623 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/grid/tria.h | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/deal.II/deal.II/include/grid/tria.h b/deal.II/deal.II/include/grid/tria.h index d0a1ff7d6e..452c6fdabd 100644 --- a/deal.II/deal.II/include/grid/tria.h +++ b/deal.II/deal.II/include/grid/tria.h @@ -3232,25 +3232,17 @@ class Triangulation : public TriaDimensionInfo, * an optimal solution. */ TriaNumberCache number_cache; - - // Friendship includes local classes. -#if (__GNUC__==2) && (__GNUC_MINOR__ < 95) - // this seems to be disallowed - // by the standard, so gcc2.95 - // does not accept it - friend class TriaAccessor; - friend class TriaObjectAccessor<1, dim>; - friend class TriaObjectAccessor<2, dim>; - friend class TriaObjectAccessor<3, dim>; -#else - // this, however, may grant - // access to too many classes, - // but ... + + // make a couple of classes + // friends template friend class TriaAccessor; template friend class TriaObjectAccessor; -#endif + + template friend class TriaObjectAccessor<1, N>; + template friend class TriaObjectAccessor<2, N>; + template friend class TriaObjectAccessor<3, N>; friend class CellAccessor; -- 2.39.5