From: Jean-Paul Pelteret Date: Mon, 23 Jan 2017 19:17:10 +0000 (+0100) Subject: Remove C++11 features not supported by GCC 4.6. X-Git-Tag: v8.5.0-rc1~208^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=571b650c84fe13e68f8c87d389351d1988476205;p=dealii.git Remove C++11 features not supported by GCC 4.6. Fixes #3839 --- diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h index ba3e84ec8c..4fe4532609 100644 --- a/include/deal.II/lac/trilinos_sparse_matrix.h +++ b/include/deal.II/lac/trilinos_sparse_matrix.h @@ -2200,13 +2200,6 @@ namespace TrilinosWrappers */ virtual ~TrilinosPayload() {} - /** - * Default copy assignment operator. - */ - TrilinosPayload & - operator=(const TrilinosPayload &) = default; - - /** * Returns a payload configured for transpose operations */ @@ -2314,7 +2307,7 @@ namespace TrilinosWrappers * Epetra_Operator. */ virtual bool - UseTranspose () const override; + UseTranspose () const; /** * Sets an internal flag so that all operations performed by the matrix, @@ -2332,7 +2325,7 @@ namespace TrilinosWrappers * operations that may occur on different threads simultaneously. */ virtual int - SetUseTranspose (bool UseTranspose) override; + SetUseTranspose (bool UseTranspose); /** * Apply the vmult operation on a vector @p X (of internally defined @@ -2347,7 +2340,7 @@ namespace TrilinosWrappers */ virtual int Apply(const VectorType &X, - VectorType &Y) const override; + VectorType &Y) const; /** * Apply the vmult inverse operation on a vector @p X (of internally @@ -2368,7 +2361,7 @@ namespace TrilinosWrappers */ virtual int ApplyInverse(const VectorType &Y, - VectorType &X) const override; + VectorType &X) const; //@} /** @@ -2383,7 +2376,7 @@ namespace TrilinosWrappers * Epetra_Operator. */ virtual const char * - Label () const override; + Label () const; /** * Returns a reference to the underlying MPI communicator for @@ -2393,7 +2386,7 @@ namespace TrilinosWrappers * Epetra_Operator. */ virtual const Epetra_Comm & - Comm () const override; + Comm () const; /** * Return the partitioning of the domain space of this matrix, i.e., the @@ -2403,7 +2396,7 @@ namespace TrilinosWrappers * Epetra_Operator. */ virtual const Epetra_Map & - OperatorDomainMap () const override; + OperatorDomainMap () const; /** * Return the partitioning of the range space of this matrix, i.e., the @@ -2414,7 +2407,7 @@ namespace TrilinosWrappers * Epetra_Operator. */ virtual const Epetra_Map & - OperatorRangeMap () const override; + OperatorRangeMap () const; //@} private: @@ -2456,7 +2449,7 @@ namespace TrilinosWrappers * Epetra_Operator. */ virtual bool - HasNormInf () const override; + HasNormInf () const; /** * Returns the infinity norm of this operator. @@ -2466,7 +2459,7 @@ namespace TrilinosWrappers * Epetra_Operator. */ virtual double - NormInf () const override; + NormInf () const; }; /**