From: Ralf Hartmann Date: Wed, 11 Jan 2006 09:49:23 +0000 (+0000) Subject: Rename DH template parameter to DH1 in order to avoid MIPSpro's 'Declaration of DH... X-Git-Tag: v8.0.0~12679 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c61fc4236ca1dfde0f7aa6a24e947ed65066cfa;p=dealii.git Rename DH template parameter to DH1 in order to avoid MIPSpro's 'Declaration of DH hides template parameter' warning. git-svn-id: https://svn.dealii.org/trunk@11983 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 5f3be59ee1..04f4cc82da 100644 --- a/deal.II/deal.II/include/numerics/data_out.h +++ b/deal.II/deal.II/include/numerics/data_out.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -778,9 +778,9 @@ class DataOut_DoFData : public DataOutInterface # ifdef DEAL_II_NESTED_CLASS_TEMPL_FRIEND_BUG template friend class DataEntry; # else - template class DH, int N2, int N3> + template class DH1, int N2, int N3> template - friend class DataOut_DoFData::DataEntry; + friend class DataOut_DoFData::DataEntry; # endif #endif };