From: wolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Thu, 3 Apr 2003 21:49:38 +0000 (+0000)
Subject: Work around a bug in gcc3.0
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9161dc0ad2d0c74a7d716f0f8e325eaf682d9212;p=dealii-svn.git

Work around a bug in gcc3.0


git-svn-id: https://svn.dealii.org/trunk@7355 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/base/include/base/thread_management.h b/deal.II/base/include/base/thread_management.h
index 2feedc18d6..c30f9176c7 100644
--- a/deal.II/base/include/base/thread_management.h
+++ b/deal.II/base/include/base/thread_management.h
@@ -2877,7 +2877,7 @@ namespace Threads
                                         * so if the configure script
                                         * decided that this is safe.
                                         */
-#ifdef DEAL_II_NAMESP_TEMPL_FRIEND_BUG2
+#if defined(DEAL_II_NAMESP_TEMPL_FRIEND_BUG2) || defined(DEAL_II_NAMESP_TEMPL_FRIEND_BUG)
     public:
 #endif
       Thread (const boost::shared_ptr<internal::thread_description<RT> > &td)
@@ -2957,8 +2957,8 @@ namespace Threads
                                         */
       boost::shared_ptr<internal::thread_description<RT> > thread_descriptor;
 
-#ifndef DEAL_II_NAMESP_TEMPL_FRIEND_BUG2
-      template <typename RT_> friend struct Threads::internal::wrapper_base;
+#if !defined(DEAL_II_NAMESP_TEMPL_FRIEND_BUG2) && !defined(DEAL_II_NAMESP_TEMPL_FRIEND_BUG)
+      template <typename RT_> friend struct internal::wrapper_base;
 #endif
   };