]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Work around a bug in gcc3.0
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 3 Apr 2003 21:49:38 +0000 (21:49 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 3 Apr 2003 21:49:38 +0000 (21:49 +0000)
git-svn-id: https://svn.dealii.org/trunk@7355 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/base/include/base/thread_management.h

index 2feedc18d608ba2ca1a394e472e0968e3a0d5c3b..c30f9176c7992b1184687fbf73f2e85da054f744 100644 (file)
@@ -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
   };
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.