From: deal Date: Thu, 4 Mar 2004 16:15:22 +0000 (+0000) Subject: More fixes. X-Git-Tag: v8.0.0~15685 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95604eae9e47ea6e4d37f722207a73334c3a3700;p=dealii.git More fixes. git-svn-id: https://svn.dealii.org/trunk@8658 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 f059d90333..eb8761a8ee 100644 --- a/deal.II/deal.II/include/numerics/data_out.h +++ b/deal.II/deal.II/include/numerics/data_out.h @@ -704,7 +704,7 @@ class DataOut_DoFData : public DataOutInterface */ template friend class DataOut_DoFData; -#ifdef DEAL_II_CHECK_NESTED_CLASS_FRIEND_BUG +#ifdef DEAL_II_NESTED_CLASS_FRIEND_BUG /** * Make DataEntry a friend. This should * not be strictly necessary, since @@ -714,8 +714,15 @@ class DataOut_DoFData : public DataOutInterface * DataEntry can't derive from * 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... */ - template friend class DataEntry; + template + template + friend class DataOut_DoFData::DataEntry; #endif };