From: wolf Date: Tue, 7 Jan 2003 21:28:29 +0000 (+0000) Subject: Try to remove at least one of the conditionals. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0063578174272197c6f63dcd7edfc4545d94e90c;p=dealii-svn.git Try to remove at least one of the conditionals. git-svn-id: https://svn.dealii.org/trunk@6883 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 d091a39105..a5461d29b9 100644 --- a/deal.II/base/include/base/thread_management.h +++ b/deal.II/base/include/base/thread_management.h @@ -412,21 +412,17 @@ namespace Threads typedef RetType (Class::*type) (); }; -#ifdef DEAL_II_CONST_MEM_FUN_PTR_BUG /** * Same as above, but for the case * of a member function marked - * @p{const}. This should not - * really be necessary, but Intel's - * compiler has a bug here so we - * have to work around. + * @p{const}. */ template struct MemFunPtr0 { typedef RetType (Class::*type) () const; }; -#endif + /** * Given a class, argument types, * and the return type, generate a @@ -439,21 +435,17 @@ namespace Threads typedef RetType (Class::*type) (Arg1); }; -#ifdef DEAL_II_CONST_MEM_FUN_PTR_BUG /** * Same as above, but for the case * of a member function marked - * @p{const}. This should not - * really be necessary, but Intel's - * compiler has a bug here so we - * have to work around. + * @p{const}. */ template struct MemFunPtr1 { typedef RetType (Class::*type) (Arg1) const; }; -#endif + /** * Given a class, argument types, * and the return type, generate a @@ -466,21 +458,17 @@ namespace Threads typedef RetType (Class::*type) (Arg1, Arg2); }; -#ifdef DEAL_II_CONST_MEM_FUN_PTR_BUG /** * Same as above, but for the case * of a member function marked - * @p{const}. This should not - * really be necessary, but Intel's - * compiler has a bug here so we - * have to work around. + * @p{const}. */ template struct MemFunPtr2 { typedef RetType (Class::*type) (Arg1, Arg2) const; }; -#endif + /** * Given a class, argument types, @@ -494,21 +482,17 @@ namespace Threads typedef RetType (Class::*type) (Arg1, Arg2, Arg3); }; -#ifdef DEAL_II_CONST_MEM_FUN_PTR_BUG /** * Same as above, but for the case * of a member function marked - * @p{const}. This should not - * really be necessary, but Intel's - * compiler has a bug here so we - * have to work around. + * @p{const}. */ template struct MemFunPtr3 { typedef RetType (Class::*type) (Arg1, Arg2, Arg3) const; }; -#endif + /** * Given a class, argument types, @@ -522,21 +506,17 @@ namespace Threads typedef RetType (Class::*type) (Arg1, Arg2, Arg3, Arg4); }; -#ifdef DEAL_II_CONST_MEM_FUN_PTR_BUG /** * Same as above, but for the case * of a member function marked - * @p{const}. This should not - * really be necessary, but Intel's - * compiler has a bug here so we - * have to work around. + * @p{const}. */ template struct MemFunPtr4 { typedef RetType (Class::*type) (Arg1, Arg2, Arg3, Arg4) const; }; -#endif + /** * Given a class, argument types, @@ -550,21 +530,17 @@ namespace Threads typedef RetType (Class::*type) (Arg1, Arg2, Arg3, Arg4, Arg5); }; -#ifdef DEAL_II_CONST_MEM_FUN_PTR_BUG /** * Same as above, but for the case * of a member function marked - * @p{const}. This should not - * really be necessary, but Intel's - * compiler has a bug here so we - * have to work around. + * @p{const}. */ template struct MemFunPtr5 { typedef RetType (Class::*type) (Arg1, Arg2, Arg3, Arg4, Arg5) const; }; -#endif + /** * Given a class, argument types, @@ -578,21 +554,17 @@ namespace Threads typedef RetType (Class::*type) (Arg1, Arg2, Arg3, Arg4, Arg5, Arg6); }; -#ifdef DEAL_II_CONST_MEM_FUN_PTR_BUG /** * Same as above, but for the case * of a member function marked - * @p{const}. This should not - * really be necessary, but Intel's - * compiler has a bug here so we - * have to work around. + * @p{const}. */ template struct MemFunPtr6 { typedef RetType (Class::*type) (Arg1, Arg2, Arg3, Arg4, Arg5, Arg6) const; }; -#endif + /** * Given a class, argument types, @@ -606,21 +578,17 @@ namespace Threads typedef RetType (Class::*type) (Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7); }; -#ifdef DEAL_II_CONST_MEM_FUN_PTR_BUG /** * Same as above, but for the case * of a member function marked - * @p{const}. This should not - * really be necessary, but Intel's - * compiler has a bug here so we - * have to work around. + * @p{const}. */ template struct MemFunPtr7 { typedef RetType (Class::*type) (Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7) const; }; -#endif + /** @@ -635,21 +603,17 @@ namespace Threads typedef RetType (Class::*type) (Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8); }; -#ifdef DEAL_II_CONST_MEM_FUN_PTR_BUG /** * Same as above, but for the case * of a member function marked - * @p{const}. This should not - * really be necessary, but Intel's - * compiler has a bug here so we - * have to work around. + * @p{const}. */ template struct MemFunPtr8 { typedef RetType (Class::*type) (Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8) const; }; -#endif + @@ -665,21 +629,17 @@ namespace Threads typedef RetType (Class::*type) (Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9); }; -#ifdef DEAL_II_CONST_MEM_FUN_PTR_BUG /** * Same as above, but for the case * of a member function marked - * @p{const}. This should not - * really be necessary, but Intel's - * compiler has a bug here so we - * have to work around. + * @p{const}. */ template struct MemFunPtr9 { typedef RetType (Class::*type) (Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9) const; }; -#endif + @@ -696,21 +656,17 @@ namespace Threads typedef RetType (Class::*type) (Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10); }; -#ifdef DEAL_II_CONST_MEM_FUN_PTR_BUG /** * Same as above, but for the case * of a member function marked - * @p{const}. This should not - * really be necessary, but Intel's - * compiler has a bug here so we - * have to work around. + * @p{const}. */ template struct MemFunPtr10 { typedef RetType (Class::*type) (Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10) const; }; -#endif +