From d68cdf63a54b0b5ab2842b954492da939278662f Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Sun, 17 Dec 2017 15:04:48 -0500 Subject: [PATCH] Remove DEAL_II_WITH_CXX11 guards --- include/deal.II/lac/sparse_matrix.h | 2 -- include/deal.II/lac/vector.h | 2 -- include/deal.II/lac/vector.templates.h | 2 -- 3 files changed, 6 deletions(-) diff --git a/include/deal.II/lac/sparse_matrix.h b/include/deal.II/lac/sparse_matrix.h index a3b2216b0e..7bddb45234 100644 --- a/include/deal.II/lac/sparse_matrix.h +++ b/include/deal.II/lac/sparse_matrix.h @@ -590,13 +590,11 @@ public: */ SparseMatrix &operator = (const SparseMatrix &); -#ifdef DEAL_II_WITH_CXX11 /** * Move assignment operator. This operator replaces the present matrix with * @p m by transferring the internal data of @p m. */ SparseMatrix &operator = (SparseMatrix &&m); -#endif /** * Copy operator: initialize the matrix with the identity matrix. This diff --git a/include/deal.II/lac/vector.h b/include/deal.II/lac/vector.h index e6ecc69225..acccbd1458 100644 --- a/include/deal.II/lac/vector.h +++ b/include/deal.II/lac/vector.h @@ -308,14 +308,12 @@ public: */ Vector &operator= (const Vector &v); -#ifdef DEAL_II_WITH_CXX11 /** * Move the given vector. This operator replaces the present vector with * the internal data of the vector @p v and resets @p v to the state it would * have after being newly default-constructed. */ Vector &operator= (Vector &&v); -#endif /** * Copy the given vector. Resize the present vector if necessary. diff --git a/include/deal.II/lac/vector.templates.h b/include/deal.II/lac/vector.templates.h index c301b955e5..19eaafcf05 100644 --- a/include/deal.II/lac/vector.templates.h +++ b/include/deal.II/lac/vector.templates.h @@ -216,7 +216,6 @@ Vector::operator= (const Vector &v) -#ifdef DEAL_II_WITH_CXX11 template inline Vector & @@ -234,7 +233,6 @@ Vector::operator= (Vector &&v) return *this; } -#endif -- 2.39.5