From: wolf Date: Thu, 4 Mar 2004 16:07:56 +0000 (+0000) Subject: Work around a bug in icc. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68709733887199eac4c2c2b43bd571a10ba17b5c;p=dealii-svn.git Work around a bug in icc. git-svn-id: https://svn.dealii.org/trunk@8656 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/numerics/data_out.h b/deal.II/deal.II/include/numerics/data_out.h index 742ddcb497..f059d90333 100644 --- a/deal.II/deal.II/include/numerics/data_out.h +++ b/deal.II/deal.II/include/numerics/data_out.h @@ -703,6 +703,20 @@ class DataOut_DoFData : public DataOutInterface * @p{merge_patches} function. */ template friend class DataOut_DoFData; + +#ifdef DEAL_II_CHECK_NESTED_CLASS_FRIEND_BUG + /** + * Make DataEntry a friend. This should + * not be strictly necessary, since + * members are implicitly friends, but in + * this case it seems as if icc needs + * this. Otherwise, it complains that + * DataEntry can't derive from + * DataEntryBase since the latter is a + * private member of DataOut_DoFData. + */ + template friend class DataEntry; +#endif };