From cc7f2a00ef176431e453de88ee286c0e257a18f8 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 29 Dec 2014 21:23:12 -0600 Subject: [PATCH] Remove deprecated classes Threads::ThreadCondition and Threads::ThreadMutex. --- doc/news/changes.h | 1 + include/deal.II/base/thread_management.h | 20 -------------------- tests/base/mutex_01.cc | 2 +- tests/benchmarks/old/spec2006-447.dealII.cc | 8 ++++---- tests/bits/step-13.cc | 8 ++++---- tests/bits/step-14.cc | 8 ++++---- tests/fail/hp-step-14.cc | 8 ++++---- tests/hp/step-13.cc | 8 ++++---- 8 files changed, 22 insertions(+), 41 deletions(-) diff --git a/doc/news/changes.h b/doc/news/changes.h index a7fffb0623..7ab87361e9 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -54,6 +54,7 @@ inconvenience this causes. MGSmootherPrecondition that take a VectorMemory object. - Deprecated variants of MeshWorker::loop and MeshWorker::integration_loop. - ThreadManagement::spawn. + - Threads::ThreadCondition and Threads::ThreadMutex.
  • Removed: The config.h file no longer exports HAVE_* definitions. diff --git a/include/deal.II/base/thread_management.h b/include/deal.II/base/thread_management.h index 6dd5483a59..c8d7afd128 100644 --- a/include/deal.II/base/thread_management.h +++ b/include/deal.II/base/thread_management.h @@ -436,24 +436,6 @@ namespace Threads }; - /** - * Provide a backward compatible name (we used ThreadMutex up to release - * 6.1, but since it is already in a namespace Threads this seems - * redundant). - * - * @deprecated - */ - typedef Mutex ThreadMutex DEAL_II_DEPRECATED; - - /** - * Provide a backward compatible name (we used ThreadCondition up to release - * 6.1, but since it is already in a namespace Threads this seems - * redundant). - * - * @deprecated - */ - typedef ConditionVariable ThreadCondition DEAL_II_DEPRECATED; - /** * If using POSIX functions, then alias the POSIX wrapper classes to the * names we use throughout the library. @@ -467,7 +449,6 @@ namespace Threads * objects. Likewise for the barrier class. */ typedef DummyThreadMutex Mutex; - typedef DummyThreadMutex ThreadMutex; /** * In non-multithread mode, the mutex and thread management classes are @@ -475,7 +456,6 @@ namespace Threads * objects. Likewise for the barrier class. */ typedef DummyThreadCondition ConditionVariable; - typedef DummyThreadCondition ThreadCondition; /** * In non-multithread mode, the mutex and thread management classes are diff --git a/tests/base/mutex_01.cc b/tests/base/mutex_01.cc index cac67b4091..8c4adc8d8b 100644 --- a/tests/base/mutex_01.cc +++ b/tests/base/mutex_01.cc @@ -24,7 +24,7 @@ #include -Threads::ThreadMutex mutex; +Threads::Mutex mutex; void test () diff --git a/tests/benchmarks/old/spec2006-447.dealII.cc b/tests/benchmarks/old/spec2006-447.dealII.cc index ecaa901f06..f009095a5b 100644 --- a/tests/benchmarks/old/spec2006-447.dealII.cc +++ b/tests/benchmarks/old/spec2006-447.dealII.cc @@ -644,7 +644,7 @@ namespace LaplaceSolver assemble_matrix (LinearSystem &linear_system, const typename DoFHandler::active_cell_iterator &begin_cell, const typename DoFHandler::active_cell_iterator &end_cell, - Threads::ThreadMutex &mutex) const; + Threads::Mutex &mutex) const; }; @@ -717,7 +717,7 @@ namespace LaplaceSolver dof_handler.end (), n_threads); - Threads::ThreadMutex mutex; + Threads::Mutex mutex; Threads::ThreadGroup<> threads; for (unsigned int thread=0; thread::assemble_matrix, *this, @@ -750,7 +750,7 @@ namespace LaplaceSolver Solver::assemble_matrix (LinearSystem &linear_system, const typename DoFHandler::active_cell_iterator &begin_cell, const typename DoFHandler::active_cell_iterator &end_cell, - Threads::ThreadMutex &mutex) const + Threads::Mutex &mutex) const { MappingQ mapping (4); FEValues fe_values (mapping, *fe, *quadrature, @@ -797,7 +797,7 @@ namespace LaplaceSolver cell->get_dof_indices (local_dof_indices); - Threads::ThreadMutex::ScopedLock lock (mutex); + Threads::Mutex::ScopedLock lock (mutex); for (unsigned int i=0; i::active_cell_iterator &begin_cell, const typename DoFHandler::active_cell_iterator &end_cell, - Threads::ThreadMutex &mutex) const; + Threads::Mutex &mutex) const; }; @@ -364,7 +364,7 @@ namespace LaplaceSolver dof_handler.end (), n_threads); - Threads::ThreadMutex mutex; + Threads::Mutex mutex; Threads::ThreadGroup<> threads; for (unsigned int thread=0; thread::assemble_matrix, *this, @@ -399,7 +399,7 @@ namespace LaplaceSolver Solver::assemble_matrix (LinearSystem &linear_system, const typename DoFHandler::active_cell_iterator &begin_cell, const typename DoFHandler::active_cell_iterator &end_cell, - Threads::ThreadMutex &mutex) const + Threads::Mutex &mutex) const { FEValues fe_values (*fe, *quadrature, update_gradients | update_JxW_values); @@ -428,7 +428,7 @@ namespace LaplaceSolver cell->get_dof_indices (local_dof_indices); - Threads::ThreadMutex::ScopedLock lock (mutex); + Threads::Mutex::ScopedLock lock (mutex); for (unsigned int i=0; i::active_cell_iterator &begin_cell, const typename DoFHandler::active_cell_iterator &end_cell, - Threads::ThreadMutex &mutex) const; + Threads::Mutex &mutex) const; }; @@ -451,7 +451,7 @@ namespace LaplaceSolver n_threads); { - Threads::ThreadMutex mutex; + Threads::Mutex mutex; for (unsigned int thread=0; thread::assemble_matrix (LinearSystem &linear_system, const typename DoFHandler::active_cell_iterator &begin_cell, const typename DoFHandler::active_cell_iterator &end_cell, - Threads::ThreadMutex &mutex) const + Threads::Mutex &mutex) const { FEValues fe_values (*fe, *quadrature, update_gradients | update_JxW_values); @@ -513,7 +513,7 @@ namespace LaplaceSolver cell->get_dof_indices (local_dof_indices); - Threads::ThreadMutex::ScopedLock lock (mutex); + Threads::Mutex::ScopedLock lock (mutex); for (unsigned int i=0; i::active_cell_iterator &begin_cell, const typename hp::DoFHandler::active_cell_iterator &end_cell, - Threads::ThreadMutex &mutex) const; + Threads::Mutex &mutex) const; }; @@ -450,7 +450,7 @@ namespace LaplaceSolver dof_handler.end (), n_threads); - Threads::ThreadMutex mutex; + Threads::Mutex mutex; Threads::ThreadGroup<> threads; for (unsigned int thread=0; thread::assemble_matrix, *this, @@ -483,7 +483,7 @@ namespace LaplaceSolver Solver::assemble_matrix (LinearSystem &linear_system, const typename hp::DoFHandler::active_cell_iterator &begin_cell, const typename hp::DoFHandler::active_cell_iterator &end_cell, - Threads::ThreadMutex &mutex) const + Threads::Mutex &mutex) const { hp::FEValues fe_values (*fe, *quadrature, update_gradients | update_JxW_values); @@ -511,7 +511,7 @@ namespace LaplaceSolver cell->get_dof_indices (local_dof_indices); - Threads::ThreadMutex::ScopedLock lock (mutex); + Threads::Mutex::ScopedLock lock (mutex); for (unsigned int i=0; i::active_cell_iterator &begin_cell, const typename hp::DoFHandler::active_cell_iterator &end_cell, - Threads::ThreadMutex &mutex) const; + Threads::Mutex &mutex) const; }; @@ -364,7 +364,7 @@ namespace LaplaceSolver dof_handler.end (), n_threads); - Threads::ThreadMutex mutex; + Threads::Mutex mutex; Threads::ThreadGroup<> threads; for (unsigned int thread=0; thread::assemble_matrix, *this, @@ -399,7 +399,7 @@ namespace LaplaceSolver Solver::assemble_matrix (LinearSystem &linear_system, const typename hp::DoFHandler::active_cell_iterator &begin_cell, const typename hp::DoFHandler::active_cell_iterator &end_cell, - Threads::ThreadMutex &mutex) const + Threads::Mutex &mutex) const { hp::FEValues fe_values (*fe, *quadrature, update_gradients | update_JxW_values); @@ -428,7 +428,7 @@ namespace LaplaceSolver cell->get_dof_indices (local_dof_indices); - Threads::ThreadMutex::ScopedLock lock (mutex); + Threads::Mutex::ScopedLock lock (mutex); for (unsigned int i=0; i