Also avoid using deallog.push/pop in other places.

diff --git a/include/deal.II/algorithms/newton.templates.h b/include/deal.II/algorithms/newton.templates.h
index c3bf3c08d22346cdb5b5c979a9adb6f33f07145f..6994407aaf0a15c7a398c6fca28ca5e23287ebaa 100644 (file)
--- a/include/deal.II/algorithms/newton.templates.h
+++ b/include/deal.II/algorithms/newton.templates.h
@@ -100,7 +100,7 @@ namespace Algorithms
                                   const AnyData &in)
   {
     Assert (out.size() == 1, ExcNotImplemented());
-    deallog.push ("Newton");
+    LogStream::Prefix prefix("Newton");
 
     VectorType &u = *out.entry<VectorType *>(0);
 
@@ -197,7 +197,6 @@ namespace Algorithms
             resnorm = res->l2_norm();
           }
       }
-    deallog.pop();
 
     // in case of failure: throw exception
     if (control.last_check() != SolverControl::success)

diff --git a/include/deal.II/algorithms/theta_timestepping.templates.h b/include/deal.II/algorithms/theta_timestepping.templates.h
index d332393b85940b7ffb75c57c56003be442c1d6bc..ebc9eec8e355de3c7458ed124a5521517c487e01 100644 (file)
--- a/include/deal.II/algorithms/theta_timestepping.templates.h
+++ b/include/deal.II/algorithms/theta_timestepping.templates.h
@@ -81,7 +81,7 @@ namespace Algorithms
   {
     Assert(!adaptive, ExcNotImplemented());
 
-    deallog.push ("Theta");
+    LogStream::Prefix prefix("Theta");
 
     VectorType &solution = *out.entry<VectorType *>(0);
     GrowingVectorMemory<VectorType> mem;
@@ -143,7 +143,6 @@ namespace Algorithms
 
         d_explicit.time = control.now();
       }
-    deallog.pop();
   }
 }
 

diff --git a/include/deal.II/lac/eigen.h b/include/deal.II/lac/eigen.h
index e9da6fa6c2e73d2f4cc31a10620d19c642eca9c7..ae2f9292776f453afb83778be2a4de3d0c3f2906 100644 (file)
--- a/include/deal.II/lac/eigen.h
+++ b/include/deal.II/lac/eigen.h
@@ -237,7 +237,7 @@ EigenPower<VectorType>::solve (double           &value,
 {
   SolverControl::State conv=SolverControl::iterate;
 
-  deallog.push("Power method");
+  LogStream::Prefix prefix("Power method");
 
   typename VectorMemory<VectorType>::Pointer Vy (this->memory);
   VectorType &y = *Vy;
@@ -291,8 +291,6 @@ EigenPower<VectorType>::solve (double           &value,
       conv = this->iteration_status (iter, std::fabs(1./length-1./old_length), x);
     }
 
-  deallog.pop();
-
   // in case of failure: throw exception
   AssertThrow(conv == SolverControl::success, SolverControl::NoConvergence (iter,
               std::fabs(1./length-1./old_length)));
@@ -326,7 +324,7 @@ EigenInverse<VectorType>::solve (double           &value,
                                  const MatrixType &A,
                                  VectorType       &x)
 {
-  deallog.push("Wielandt");
+  LogStream::Prefix prefix("Wielandt");
 
   SolverControl::State conv=SolverControl::iterate;
 
@@ -416,8 +414,6 @@ EigenInverse<VectorType>::solve (double           &value,
       old_value = value;
     }
 
-  deallog.pop();
-
   // in case of failure: throw
   // exception
   AssertThrow (conv == SolverControl::success,

diff --git a/include/deal.II/multigrid/mg_block_smoother.h b/include/deal.II/multigrid/mg_block_smoother.h
index cf5988870dbb01226dcd4e5276d3c9834e14a0ee..5609d91a3d676e9b4a511f6441e7b8d8a9498f49 100644 (file)
--- a/include/deal.II/multigrid/mg_block_smoother.h
+++ b/include/deal.II/multigrid/mg_block_smoother.h
@@ -231,7 +231,7 @@ MGSmootherBlock<MatrixType, RelaxationType, number>::smooth(const unsigned int
                                                             BlockVector<number>       &u,
                                                             const BlockVector<number> &rhs) const
 {
-  deallog.push("Smooth");
+  LogStream::Prefix prefix("Smooth");
 
   unsigned int maxlevel = matrices.max_level();
   unsigned int steps2 = this->steps;
@@ -266,8 +266,6 @@ MGSmootherBlock<MatrixType, RelaxationType, number>::smooth(const unsigned int
       if (this->symmetric)
         T = !T;
     }
-
-  deallog.pop();
 }
 
 #endif // DOXYGEN