From d37da47b130077b8c9735adbc43db4991fe5e6dd Mon Sep 17 00:00:00 2001 From: wolf Date: Mon, 8 Mar 2004 16:11:00 +0000 Subject: [PATCH] Work around nasty problems with gcc 2.95. git-svn-id: https://svn.dealii.org/trunk@8676 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/numerics/data_out.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/deal.II/deal.II/include/numerics/data_out.h b/deal.II/deal.II/include/numerics/data_out.h index eb8761a8ee..b35685178c 100644 --- a/deal.II/deal.II/include/numerics/data_out.h +++ b/deal.II/deal.II/include/numerics/data_out.h @@ -715,14 +715,19 @@ class DataOut_DoFData : public DataOutInterface * DataEntryBase since the latter is a * private member of DataOut_DoFData. * - * For whatever weird reason, it - * is also not enough to make - * just DataEntry a friend, but - * we have to fully qualify it... + * For whatever weird reason, it is also + * not enough to make just DataEntry a + * friend, but we have to fully qualify + * it for icc, while gcc 2.95 insists on + * the non-qualified version... */ +# ifdef DEAL_II_NESTED_CLASS_TEMPL_FRIEND_BUG + template friend class DataEntry; +# else template template friend class DataOut_DoFData::DataEntry; +# endif #endif }; -- 2.39.5