remove dead code

diff --git a/include/deal.II/base/parallel.h b/include/deal.II/base/parallel.h
index a66badaa86a343403a88ba45ee577c71c1fe703c..87fefbeccd702822bf2d6069d62d864b7a6ca7e0 100644 (file)
--- 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<ResultType, Function> reductor(
       f, std::plus<ResultType>(), 0);

diff --git a/include/deal.II/base/symmetric_tensor.h b/include/deal.II/base/symmetric_tensor.h
index af5539248b219328d779418f90486f771754b5bd..dc8ec0c2f37d0c059dc071f82ba9e6c89ec8f9c4 100644 (file)
--- 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 <int, int, bool, int, typename>
       friend class Accessor;
-#ifndef DEAL_II_TEMPL_SPEC_FRIEND_BUG
       friend class ::dealii::SymmetricTensor<rank, dim, Number>;
       friend class Accessor<rank, dim, constness, P + 1, Number>;
-#endif
     };
 
 
@@ -523,11 +521,9 @@ namespace internal
       friend class dealii::SymmetricTensor;
       template <int, int, bool, int, typename>
       friend class SymmetricTensorAccessors::Accessor;
-#ifndef DEAL_II_TEMPL_SPEC_FRIEND_BUG
       friend class ::dealii::SymmetricTensor<rank, dim, Number>;
       friend class SymmetricTensorAccessors::
         Accessor<rank, dim, constness, 2, Number>;
-#endif
     };
   } // namespace SymmetricTensorAccessors
 } // namespace internal

diff --git a/include/deal.II/base/table.h b/include/deal.II/base/table.h
index 285e9d268be2fe53132200492501bfc9cd043fce..7b4c0fd36481590ee41c96893b1410ed01db2052 100644 (file)
--- 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 <int N1, typename T1, bool C1, unsigned int P1>
       friend class Accessor;
-#ifndef DEAL_II_TEMPL_SPEC_FRIEND_BUG
       friend class dealii::Table<N, T>;
       friend class Accessor<N, T, C, P + 1>;
-#endif
     };
 
 
@@ -331,10 +329,8 @@ namespace internal
       friend class dealii::Table;
       template <int N1, typename T1, bool C1, unsigned int P1>
       friend class Accessor;
-#ifndef DEAL_II_TEMPL_SPEC_FRIEND_BUG
       friend class dealii::Table<2, T>;
       friend class Accessor<N, T, C, 2>;
-#endif
     };
   } // namespace TableBaseAccessors
 

diff --git a/include/deal.II/base/thread_management.h b/include/deal.II/base/thread_management.h
index aa9348c63339124e95fd7ef4bb6e392f00497cf6..4546ec0b2aa5df438f635295be8a819c1a9f39f8 100644 (file)
--- 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<Args>::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<RT()>(std::bind(
       fun_ptr, std::cref(c), internal::maybe_make_ref<Args>::act(args)...)));
   }
-#  endif
 
   // ------------------------ ThreadGroup -------------------------------------
 
@@ -1499,7 +1497,6 @@ namespace Threads
       fun_ptr, std::ref(c), internal::maybe_make_ref<Args>::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<RT()>(std::bind(
       fun_ptr, std::cref(c), internal::maybe_make_ref<Args>::act(args)...)));
   }
-#  endif
 
 
   // ------------------------ TaskGroup -------------------------------------