Remove deprecated function TrilinosWrappers::*Vector*::compress with Epetra_CombineMo...

diff --git a/doc/news/changes.h b/doc/news/changes.h
index 7e155f1eda2e03ee43f83ff620ee3529e37eefb5..ac0dfb0dc62dde54e2a933abe70e93dbb80a5c65 100644 (file)
--- a/doc/news/changes.h
+++ b/doc/news/changes.h
@@ -117,6 +117,8 @@ inconvenience this causes.
   <code>normal_vector</code> ones. In all cases, the new functions
   have been around for a while.
 - Vector::scale.
+- TrilinosWrappers::*Vector*::compress with an Epetra_CombineMode
+  argument
 
 <!-- ----------- GENERAL IMPROVEMENTS ----------------- -->
 

diff --git a/include/deal.II/lac/trilinos_block_vector.h b/include/deal.II/lac/trilinos_block_vector.h
index a063d40a78310775c77f4adc1df69532c4fbca7d..c3f0b879895cc85cfce53ac7b4d6dc615fd3441d 100644 (file)
--- a/include/deal.II/lac/trilinos_block_vector.h
+++ b/include/deal.II/lac/trilinos_block_vector.h
@@ -154,22 +154,6 @@ namespace TrilinosWrappers
      */
     ~BlockVector ();
 
-    /**
-     * use compress(VectorOperation) instead
-     *
-     * @deprecated
-     *
-     * See
-     * @ref GlossCompress "Compressing distributed objects"
-     * for more information.
-     */
-    void compress (const Epetra_CombineMode last_action) DEAL_II_DEPRECATED;
-
-    /**
-     * so it is not hidden
-     */
-    using BlockVectorBase<Vector>::compress;
-
     /**
      * Copy operator: fill all components of the vector that are locally
      * stored with the given scalar value.
@@ -414,19 +398,6 @@ namespace TrilinosWrappers
   }
 
 
-  inline
-  void
-  BlockVector::compress (const Epetra_CombineMode last_action)
-  {
-    if (last_action == Add)
-      this->compress(::dealii::VectorOperation::add);
-    else if (last_action == Insert)
-      this->compress(::dealii::VectorOperation::insert);
-    else
-      AssertThrow(false, ExcNotImplemented());
-  }
-
-
   inline
   void
   BlockVector::swap (BlockVector &v)

diff --git a/include/deal.II/lac/trilinos_parallel_block_vector.h b/include/deal.II/lac/trilinos_parallel_block_vector.h
index a0291b5c503e1463f1a9fc40c0012c3cf3e13e23..2fdddaebabb3f64ea732162ea6b40e97ce148d34 100644 (file)
--- a/include/deal.II/lac/trilinos_parallel_block_vector.h
+++ b/include/deal.II/lac/trilinos_parallel_block_vector.h
@@ -262,24 +262,6 @@ namespace TrilinosWrappers
       void import_nonlocal_data_for_fe (const TrilinosWrappers::BlockSparseMatrix &m,
                                         const BlockVector                         &v);
 
-
-      /**
-       * use compress(VectorOperation) instead
-       *
-       * @deprecated
-       *
-       * See
-       * @ref GlossCompress "Compressing distributed objects"
-       * for more information.
-       */
-      void compress (const Epetra_CombineMode last_action) DEAL_II_DEPRECATED;
-
-      /**
-       * so it is not hidden
-       */
-      using BlockVectorBase<Vector>::compress;
-
-
       /**
        * Returns the state of the vector, i.e., whether compress() needs to be
        * called after an operation requiring data exchange. Does only return
@@ -414,24 +396,6 @@ namespace TrilinosWrappers
 
 
 
-    inline
-    void
-    BlockVector::compress (const Epetra_CombineMode last_action)
-    {
-      ::dealii::VectorOperation::values last_action_ =
-        ::dealii::VectorOperation::unknown;
-      if (last_action == Add)
-        last_action_ = ::dealii::VectorOperation::add;
-      else if (last_action == Insert)
-        last_action_ = ::dealii::VectorOperation::insert;
-      else
-        AssertThrow(false, ExcNotImplemented());
-
-      this->compress(last_action_);
-    }
-
-
-
     template <typename Number>
     BlockVector &
     BlockVector::operator = (const ::dealii::BlockVector<Number> &v)

diff --git a/include/deal.II/lac/trilinos_vector_base.h b/include/deal.II/lac/trilinos_vector_base.h
index 50d54123fa1892c18fddd06aef1048d30412fb8d..d0acd63090a9b46f1a2c17d221fede5ab83715ed 100644 (file)
--- a/include/deal.II/lac/trilinos_vector_base.h
+++ b/include/deal.II/lac/trilinos_vector_base.h
@@ -282,11 +282,6 @@ namespace TrilinosWrappers
      */
     void compress (::dealii::VectorOperation::values operation);
 
-    /**
-     * @deprecated Use compress(dealii::VectorOperation::values) instead.
-     */
-    void compress (const Epetra_CombineMode last_action) DEAL_II_DEPRECATED;
-
     /**
      * Returns the state of the vector, i.e., whether compress() has already
      * been called after an operation requiring data exchange.
@@ -1206,24 +1201,6 @@ namespace TrilinosWrappers
 
 
 
-  inline
-  void
-  VectorBase::compress (const Epetra_CombineMode last_action)
-  {
-    ::dealii::VectorOperation::values last_action_ =
-      ::dealii::VectorOperation::unknown;
-    if (last_action == Add)
-      last_action_ = ::dealii::VectorOperation::add;
-    else if (last_action == Insert)
-      last_action_ = ::dealii::VectorOperation::insert;
-    else
-      AssertThrow(false, ExcNotImplemented());
-
-    compress(last_action_);
-  }
-
-
-
   inline
   VectorBase &
   VectorBase::operator = (const TrilinosScalar s)