From 6f0effbae0dede6502c8ecb24f345c90a413bea2 Mon Sep 17 00:00:00 2001 From: wolf Date: Tue, 18 Jan 2000 15:29:19 +0000 Subject: [PATCH] Add support for void member functions (as opposed to void* return values), and convert existing code to that. git-svn-id: https://svn.dealii.org/trunk@2250 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/numerics/time_dependent.h | 4 ++-- deal.II/deal.II/source/numerics/time_dependent.cc | 5 ++--- deal.II/lac/Todo | 5 +++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/deal.II/deal.II/include/numerics/time_dependent.h b/deal.II/deal.II/include/numerics/time_dependent.h index c3927a9aee..3e73d67915 100644 --- a/deal.II/deal.II/include/numerics/time_dependent.h +++ b/deal.II/deal.II/include/numerics/time_dependent.h @@ -713,8 +713,8 @@ class TimeDependent * for some timesteps only. This * is useful in multithread mode. */ - void * end_sweep (const unsigned int begin_timestep, - const unsigned int end_timestep); + void end_sweep (const unsigned int begin_timestep, + const unsigned int end_timestep); }; diff --git a/deal.II/deal.II/source/numerics/time_dependent.cc b/deal.II/deal.II/source/numerics/time_dependent.cc index dbca98e07c..f460751a39 100644 --- a/deal.II/deal.II/source/numerics/time_dependent.cc +++ b/deal.II/deal.II/source/numerics/time_dependent.cc @@ -239,12 +239,11 @@ void TimeDependent::end_sweep (const unsigned int n_threads) -void * TimeDependent::end_sweep (const unsigned int begin, - const unsigned int end) +void TimeDependent::end_sweep (const unsigned int begin, + const unsigned int end) { for (unsigned int step=begin; stepend_sweep (); - return 0; }; diff --git a/deal.II/lac/Todo b/deal.II/lac/Todo index 6c934926c4..bf2b8a23f4 100644 --- a/deal.II/lac/Todo +++ b/deal.II/lac/Todo @@ -25,3 +25,8 @@ Someone should take a look at the handling of the sparsity variable in the sparse matrix: it is subscribed to twice (explicitely and through the subscriptor); the explicit subscription is redundant, but I don't have the time to look into that now. + + +Change the threaded* functions of the SparseMatrix to return void + instead of void* when the respective classes in ThreadManager are + updated. -- 2.39.5