From df9cb1ec795f8ed92575295991f8e6440d59a048 Mon Sep 17 00:00:00 2001
From: wolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
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 <typename> friend class PredicateTemplate;
+#  else
     template <typename T>
     template <typename>
     friend class FilteredIterator<T>::PredicateTemplate;
+#  endif
 #endif
 };
 
-- 
2.39.5