Mark deprecated variables as deprecated

diff --git a/include/deal.II/lac/precondition.h b/include/deal.II/lac/precondition.h
index 7f71ebe5258a0f93c4bd39883ddc23b0a1b640d1..352c0b2f679a316759504ebf883086fe3912f6e3 100644 (file)
--- 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<PreconditionerType> 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 <typename MatrixType, class VectorType, typename PreconditionerType>
 inline
 PreconditionChebyshev<MatrixType,VectorType,PreconditionerType>::AdditionalData::
@@ -1940,6 +1948,7 @@ AdditionalData (const unsigned int degree,
   max_eigenvalue (max_eigenvalue)
 {}
 
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 
 template <typename MatrixType, typename VectorType, typename PreconditionerType>
@@ -1956,6 +1965,8 @@ PreconditionChebyshev<MatrixType,VectorType,PreconditionerType>::PreconditionChe
 }
 
 
+// avoid warning about deprecated variable AdditionalData::matrix_diagonal_inverse
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 
 template <typename MatrixType, typename VectorType, typename PreconditionerType>
 inline
@@ -1974,6 +1985,24 @@ PreconditionChebyshev<MatrixType,VectorType,PreconditionerType>::initialize
 
 
 
+template <typename MatrixType, typename VectorType, typename PreconditionerType>
+inline
+void
+PreconditionChebyshev<MatrixType,VectorType,PreconditionerType>::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 <typename MatrixType, typename VectorType, typename PreconditionerType>
 inline
 void
@@ -2198,21 +2227,6 @@ PreconditionChebyshev<MatrixType,VectorType,PreconditionerType>
 
 
 
-template <typename MatrixType, typename VectorType, typename PreconditionerType>
-inline
-void
-PreconditionChebyshev<MatrixType,VectorType,PreconditionerType>::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 <typename MatrixType, typename VectorType, typename PreconditionerType>
 inline
 typename PreconditionChebyshev<MatrixType,VectorType,PreconditionerType>::size_type
@@ -2223,6 +2237,7 @@ PreconditionChebyshev<MatrixType,VectorType,PreconditionerType>::m () const
 }
 
 
+
 template <typename MatrixType, typename VectorType, typename PreconditionerType>
 inline
 typename PreconditionChebyshev<MatrixType,VectorType,PreconditionerType>::size_type