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

diff --git a/deal.II/deal.II/include/grid/filtered_iterator.h b/deal.II/deal.II/include/grid/filtered_iterator.h
index ce13fdf2306e4db300ded95b2c441f8a583684ac..23dc48aa366e47574d2f50bb5c34e47321532403 100644 (file)
--- 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
 };