From bf06aeef384de2e763e5231735769e2a0a84d834 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Thu, 1 May 2003 15:29:19 +0000 Subject: [PATCH] Work around bugs where icc and gcc2.95 only understand mutually exclusive pieces of code (and both are wrong to require this friend declaration in the first place)... git-svn-id: https://svn.dealii.org/trunk@7528 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/grid/filtered_iterator.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deal.II/deal.II/include/grid/filtered_iterator.h b/deal.II/deal.II/include/grid/filtered_iterator.h index ce13fdf230..23dc48aa36 100644 --- a/deal.II/deal.II/include/grid/filtered_iterator.h +++ b/deal.II/deal.II/include/grid/filtered_iterator.h @@ -676,9 +676,13 @@ class FilteredIterator : public BaseIterator const PredicateBase * predicate; #ifdef DEAL_II_NESTED_CLASS_FRIEND_BUG +# ifdef DEAL_II_NESTED_CLASS_TEMPL_FRIEND_BUG + template friend class PredicateTemplate; +# else template template friend class FilteredIterator::PredicateTemplate; +# endif #endif }; -- 2.39.5