From 2ce726c2c330cc8c93e033da8cdecad498b1639a Mon Sep 17 00:00:00 2001 From: David Wells Date: Wed, 18 Nov 2015 11:52:04 -0500 Subject: [PATCH] Revert deprecation of Vector::add(scalar). This commit partially reverts commit a45f633f0fc797a499559887d2b5d6be6bf1a508. The un-deprecated functions were found to be useful an Aspect application, where one subtracted the mean value from a vector of pressure values. --- include/deal.II/lac/parallel_vector.h | 2 +- include/deal.II/lac/petsc_vector_base.h | 2 +- include/deal.II/lac/trilinos_vector_base.h | 2 +- include/deal.II/lac/vector.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/deal.II/lac/parallel_vector.h b/include/deal.II/lac/parallel_vector.h index bb3e96d705..b00d3b1c76 100644 --- a/include/deal.II/lac/parallel_vector.h +++ b/include/deal.II/lac/parallel_vector.h @@ -821,7 +821,7 @@ namespace parallel * Addition of @p s to all components. Note that @p s is a scalar and * not a vector. */ - void add (const Number s) DEAL_II_DEPRECATED; + void add (const Number s); /** * Simple vector addition, equal to the operator +=. diff --git a/include/deal.II/lac/petsc_vector_base.h b/include/deal.II/lac/petsc_vector_base.h index 508fb50ee5..42ef242a9a 100644 --- a/include/deal.II/lac/petsc_vector_base.h +++ b/include/deal.II/lac/petsc_vector_base.h @@ -609,7 +609,7 @@ namespace PETScWrappers * Addition of @p s to all components. Note that @p s is a scalar and not * a vector. */ - void add (const PetscScalar s) DEAL_II_DEPRECATED; + void add (const PetscScalar s); /** * Simple vector addition, equal to the operator +=. diff --git a/include/deal.II/lac/trilinos_vector_base.h b/include/deal.II/lac/trilinos_vector_base.h index 415af999d9..e2722eb9d9 100644 --- a/include/deal.II/lac/trilinos_vector_base.h +++ b/include/deal.II/lac/trilinos_vector_base.h @@ -690,7 +690,7 @@ namespace TrilinosWrappers * Addition of @p s to all components. Note that @p s is a scalar and not * a vector. */ - void add (const TrilinosScalar s) DEAL_II_DEPRECATED; + void add (const TrilinosScalar s); /** * Simple vector addition, equal to the operator +=. diff --git a/include/deal.II/lac/vector.h b/include/deal.II/lac/vector.h index bb613e2151..0f0a592a8b 100644 --- a/include/deal.II/lac/vector.h +++ b/include/deal.II/lac/vector.h @@ -660,7 +660,7 @@ public: * * @dealiiOperationIsMultithreaded */ - void add (const Number s) DEAL_II_DEPRECATED; + void add (const Number s); /** * Simple vector addition, equal to the operator +=. -- 2.39.5