From: Matthias Maier Date: Sat, 23 May 2020 05:02:44 +0000 (-0500) Subject: remove dead code X-Git-Tag: v9.3.0-rc1~1579^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78c2b470dd136d4dfece5c58ee7d6bff4b92837e;p=dealii.git remove dead code --- diff --git a/include/deal.II/base/parallel.h b/include/deal.II/base/parallel.h index a66badaa86..87fefbeccd 100644 --- a/include/deal.II/base/parallel.h +++ b/include/deal.II/base/parallel.h @@ -452,14 +452,7 @@ namespace parallel // warnings about unused arguments (void)grainsize; -# ifndef DEAL_II_BIND_NO_CONST_OP_PARENTHESES f(begin, end); -# else - // work around a problem with MS VC++ where there is no const - // operator() in 'Function' if 'Function' is the result of std::bind - Function ff = f; - ff(begin, end); -# endif #else internal::parallel_for(begin, end, @@ -694,14 +687,7 @@ namespace parallel // warnings about unused arguments (void)grainsize; -# ifndef DEAL_II_BIND_NO_CONST_OP_PARENTHESES return f(begin, end); -# else - // work around a problem with MS VC++ where there is no const - // operator() in 'Function' if 'Function' is the result of std::bind - Function ff = f; - return ff(begin, end); -# endif #else internal::ReductionOnSubranges reductor( f, std::plus(), 0); diff --git a/include/deal.II/base/symmetric_tensor.h b/include/deal.II/base/symmetric_tensor.h index af5539248b..dc8ec0c2f3 100644 --- a/include/deal.II/base/symmetric_tensor.h +++ b/include/deal.II/base/symmetric_tensor.h @@ -439,10 +439,8 @@ namespace internal friend class dealii::SymmetricTensor; template friend class Accessor; -#ifndef DEAL_II_TEMPL_SPEC_FRIEND_BUG friend class ::dealii::SymmetricTensor; friend class Accessor; -#endif }; @@ -523,11 +521,9 @@ namespace internal friend class dealii::SymmetricTensor; template friend class SymmetricTensorAccessors::Accessor; -#ifndef DEAL_II_TEMPL_SPEC_FRIEND_BUG friend class ::dealii::SymmetricTensor; friend class SymmetricTensorAccessors:: Accessor; -#endif }; } // namespace SymmetricTensorAccessors } // namespace internal diff --git a/include/deal.II/base/table.h b/include/deal.II/base/table.h index 285e9d268b..7b4c0fd364 100644 --- a/include/deal.II/base/table.h +++ b/include/deal.II/base/table.h @@ -224,10 +224,8 @@ namespace internal friend class dealii::Table; template friend class Accessor; -#ifndef DEAL_II_TEMPL_SPEC_FRIEND_BUG friend class dealii::Table; friend class Accessor; -#endif }; @@ -331,10 +329,8 @@ namespace internal friend class dealii::Table; template friend class Accessor; -#ifndef DEAL_II_TEMPL_SPEC_FRIEND_BUG friend class dealii::Table<2, T>; friend class Accessor; -#endif }; } // namespace TableBaseAccessors diff --git a/include/deal.II/base/thread_management.h b/include/deal.II/base/thread_management.h index aa9348c633..4546ec0b2a 100644 --- a/include/deal.II/base/thread_management.h +++ b/include/deal.II/base/thread_management.h @@ -861,7 +861,6 @@ namespace Threads fun_ptr, std::ref(c), internal::maybe_make_ref::act(args)...))); } -# ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG /** * Overload of the new_thread function for const member functions. * @@ -877,7 +876,6 @@ namespace Threads return new_thread(std::function(std::bind( fun_ptr, std::cref(c), internal::maybe_make_ref::act(args)...))); } -# endif // ------------------------ ThreadGroup ------------------------------------- @@ -1499,7 +1497,6 @@ namespace Threads fun_ptr, std::ref(c), internal::maybe_make_ref::act(args)...))); } -# ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG /** * Overload of the new_task function. * @@ -1515,7 +1512,6 @@ namespace Threads return new_task(std::function(std::bind( fun_ptr, std::cref(c), internal::maybe_make_ref::act(args)...))); } -# endif // ------------------------ TaskGroup -------------------------------------