From: Martin Kronbichler Date: Sat, 29 Oct 2016 14:26:52 +0000 (+0200) Subject: Mark deprecated variables as deprecated X-Git-Tag: v8.5.0-rc1~520^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0de87e8c7d728e78b2a14af2ddae3c104f4562b6;p=dealii.git Mark deprecated variables as deprecated --- diff --git a/include/deal.II/lac/precondition.h b/include/deal.II/lac/precondition.h index 7f71ebe525..352c0b2f67 100644 --- a/include/deal.II/lac/precondition.h +++ b/include/deal.II/lac/precondition.h @@ -887,6 +887,9 @@ public: */ typedef types::global_dof_index size_type; + // avoid warning about use of deprecated variables + DEAL_II_DISABLE_EXTRA_DIAGNOSTICS + /** * Standardized data struct to pipe additional parameters to the * preconditioner. @@ -936,7 +939,7 @@ public: * @deprecated For non-zero starting, use the step() and Tstep() * interfaces, whereas vmult() provides the preconditioner interface. */ - bool nonzero_starting; + bool nonzero_starting DEAL_II_DEPRECATED; /** * Maximum number of CG iterations performed for finding the maximum @@ -963,7 +966,7 @@ public: * * @deprecated Set the variable @p preconditioner defined below instead. */ - VectorType matrix_diagonal_inverse; + VectorType matrix_diagonal_inverse DEAL_II_DEPRECATED; /** * Stores the preconditioner object that the Chebyshev is wrapped around. @@ -971,6 +974,8 @@ public: std_cxx11::shared_ptr preconditioner; }; + DEAL_II_ENABLE_EXTRA_DIAGNOSTICS + PreconditionChebyshev (); /** @@ -1922,6 +1927,9 @@ namespace internal +// avoid warning about deprecated variable nonzero_starting +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS + template inline PreconditionChebyshev::AdditionalData:: @@ -1940,6 +1948,7 @@ AdditionalData (const unsigned int degree, max_eigenvalue (max_eigenvalue) {} +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS template @@ -1956,6 +1965,8 @@ PreconditionChebyshev::PreconditionChe } +// avoid warning about deprecated variable AdditionalData::matrix_diagonal_inverse +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS template inline @@ -1974,6 +1985,24 @@ PreconditionChebyshev::initialize +template +inline +void +PreconditionChebyshev::clear () +{ + is_initialized = false; + matrix_ptr = 0; + data.matrix_diagonal_inverse.reinit(0); + data.preconditioner.reset(); + update1.reinit(0); + update2.reinit(0); + update3.reinit(0); +} + +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS + + + template inline void @@ -2198,21 +2227,6 @@ PreconditionChebyshev -template -inline -void -PreconditionChebyshev::clear () -{ - is_initialized = false; - matrix_ptr = 0; - data.matrix_diagonal_inverse.reinit(0); - data.preconditioner.reset(); - update1.reinit(0); - update2.reinit(0); - update3.reinit(0); -} - - template inline typename PreconditionChebyshev::size_type @@ -2223,6 +2237,7 @@ PreconditionChebyshev::m () const } + template inline typename PreconditionChebyshev::size_type