From: Daniel Arndt Date: Sun, 30 Apr 2017 15:49:59 +0000 (+0200) Subject: Remove DEAL_II_WITH_CXX11 X-Git-Tag: v9.0.0-rc1~1634^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44adb1d805e0e2e93d4bf5f747f2709133339b7c;p=dealii.git Remove DEAL_II_WITH_CXX11 --- diff --git a/include/deal.II/lac/block_indices.h b/include/deal.II/lac/block_indices.h index c10f1cb611..1e0287698e 100644 --- a/include/deal.II/lac/block_indices.h +++ b/include/deal.II/lac/block_indices.h @@ -74,13 +74,9 @@ public: */ BlockIndices (const std::vector &block_sizes); -#ifdef DEAL_II_WITH_CXX11 /** * Move constructor. Initialize a new object by stealing the internal data of * another BlockIndices object. - * - * @note This constructor is only available if deal.II is configured with - * C++11 support. */ BlockIndices (BlockIndices &&b); @@ -88,7 +84,6 @@ public: * Copy constructor. */ BlockIndices (const BlockIndices &) = default; -#endif /** * Specialized constructor for a structure with blocks of equal size. @@ -181,13 +176,11 @@ public: */ BlockIndices &operator = (const BlockIndices &b); -#ifdef DEAL_II_WITH_CXX11 /** * Move assignment operator. Move another BlockIndices object onto the * current one by transferring its contents. */ BlockIndices &operator = (BlockIndices &&); -#endif /** * Compare whether two objects are the same, i.e. whether the number of @@ -310,8 +303,6 @@ BlockIndices::BlockIndices (const std::vector &block_sizes) -#ifdef DEAL_II_WITH_CXX11 - inline BlockIndices::BlockIndices (BlockIndices &&b) : @@ -322,8 +313,6 @@ BlockIndices::BlockIndices (BlockIndices &&b) b.start_indices = std::vector(1, 0); } -#endif - inline @@ -432,7 +421,6 @@ BlockIndices::operator = (const BlockIndices &b) -#ifdef DEAL_II_WITH_CXX11 inline BlockIndices & BlockIndices::operator = (BlockIndices &&b) @@ -445,7 +433,6 @@ BlockIndices::operator = (BlockIndices &&b) return *this; } -#endif diff --git a/include/deal.II/lac/block_linear_operator.h b/include/deal.II/lac/block_linear_operator.h index 176afd707c..e62a3a4217 100644 --- a/include/deal.II/lac/block_linear_operator.h +++ b/include/deal.II/lac/block_linear_operator.h @@ -21,7 +21,6 @@ #include -#ifdef DEAL_II_WITH_CXX11 DEAL_II_NAMESPACE_OPEN @@ -134,10 +133,6 @@ block_back_substitution(const BlockLinearOperator & * sizes, and small block structure (as a rule of thumb, matrix blocks greater * than $1000\times1000$). * - * @note This class is only available if deal.II was configured with C++11 - * support, i.e., if DEAL_II_WITH_CXX11 is enabled during cmake - * configure. - * * @author Matthias Maier, 2015 * * @ingroup LAOperators @@ -901,5 +896,4 @@ block_back_substitution(const BlockLinearOperator & DEAL_II_NAMESPACE_CLOSE -#endif // DEAL_II_WITH_CXX11 #endif diff --git a/include/deal.II/lac/block_vector.h b/include/deal.II/lac/block_vector.h index f8ce49936e..84882804de 100644 --- a/include/deal.II/lac/block_vector.h +++ b/include/deal.II/lac/block_vector.h @@ -105,16 +105,11 @@ public: BlockVector (const BlockVector &V); -#ifdef DEAL_II_WITH_CXX11 /** * Move constructor. Creates a new vector by stealing the internal data of * the given argument vector. - * - * @note This constructor is only available if deal.II is configured with - * C++11 support. */ BlockVector (BlockVector &&/*v*/) = default; -#endif #ifndef DEAL_II_EXPLICIT_CONSTRUCTOR_BUG @@ -201,16 +196,11 @@ public: BlockVector & operator= (const BlockVector &v); -#ifdef DEAL_II_WITH_CXX11 /** * Move the given vector. This operator replaces the present vector with * the contents of the given argument vector. - * - * @note This operator is only available if deal.II is configured with C++11 - * support. */ BlockVector &operator= (BlockVector &&/*v*/) = default; -#endif /** * Copy operator for template arguments of different types. Resize the diff --git a/include/deal.II/lac/block_vector_base.h b/include/deal.II/lac/block_vector_base.h index 6902ce35af..733cf58eeb 100644 --- a/include/deal.II/lac/block_vector_base.h +++ b/include/deal.II/lac/block_vector_base.h @@ -267,11 +267,8 @@ namespace internal * Copy constructor from an iterator of different constness. * * @note Constructing a non-const iterator from a const iterator does - * not make sense. If deal.II was configured with C++11 support, then - * attempting this will result in a compile-time error (via - * static_assert). If deal.II was not configured with C++11 - * support, then attempting this will result in a thrown exception in - * debug mode. + * not make sense. Attempting this will result in a compile-time error + * (via static_assert). */ Iterator (const Iterator &c); @@ -423,16 +420,6 @@ namespace internal "different block vectors. There is no reasonable way " "to do this."); - /** - * Exception thrown when one attempts to copy construct a non-const - * iterator from a const iterator. - * - * @note when deal.II is compiled with C++11 support this check is - * instead performed at compile time via static_assert. - */ - DeclExceptionMsg (ExcCastingAwayConstness, - "Constructing a non-const iterator from a const " - "iterator does not make sense."); //@} private: /** @@ -580,7 +567,6 @@ public: */ BlockVectorBase (); -#ifdef DEAL_II_WITH_CXX11 /** * Copy constructor. */ @@ -590,12 +576,8 @@ public: * Move constructor. Each block of the argument vector is moved into the current * object if the underlying VectorType is move-constructible, * otherwise they are copied. - * - * @note This constructor is only available if deal.II is configured with - * C++11 support. */ BlockVectorBase (BlockVectorBase &&/*V*/) = default; -#endif /** * Update internal structures after resizing vectors. Whenever you reinited @@ -743,14 +725,12 @@ public: BlockVectorBase & operator= (const BlockVectorBase &V); -#ifdef DEAL_II_WITH_CXX11 /** * Move assignment operator. Move each block of the given argument * vector into the current object if `VectorType` is * move-constructible, otherwise copy them. */ BlockVectorBase &operator= (BlockVectorBase &&/*V*/) = default; -#endif /** * Copy operator for template arguments of different types. @@ -1046,13 +1026,9 @@ namespace internal // iterators, and not vice versa (i.e., Constness must always be // true). As mentioned above, try to check this at compile time if C++11 // support is available. -#ifdef DEAL_II_WITH_CXX11 static_assert(Constness == true, "Constructing a non-const iterator from a const iterator " "does not make sense."); -#else - Assert(Constness == true, ExcCastingAwayConstness()); -#endif } diff --git a/include/deal.II/lac/constrained_linear_operator.h b/include/deal.II/lac/constrained_linear_operator.h index 729a65e9fc..a73df3e750 100644 --- a/include/deal.II/lac/constrained_linear_operator.h +++ b/include/deal.II/lac/constrained_linear_operator.h @@ -20,7 +20,6 @@ #include #include -#ifdef DEAL_II_WITH_CXX11 DEAL_II_NAMESPACE_OPEN @@ -317,5 +316,4 @@ constrained_right_hand_side(const ConstraintMatrix &constraint_matrix, DEAL_II_NAMESPACE_CLOSE -#endif // DEAL_II_WITH_CXX11 #endif diff --git a/include/deal.II/lac/iterative_inverse.h b/include/deal.II/lac/iterative_inverse.h index 190936dc43..9c3dcd9231 100644 --- a/include/deal.II/lac/iterative_inverse.h +++ b/include/deal.II/lac/iterative_inverse.h @@ -66,10 +66,8 @@ DEAL_II_NAMESPACE_OPEN * from machine accuracy, even if the errors of the outer loop are in the * range of machine accuracy. * - * @deprecated If deal.II was configured with C++11 support, use the - * LinearOperator class instead, see the module on - * @ref LAOperators "linear operators" - * for further details. + * @deprecated Use the LinearOperator class instead. See the module on + * @ref LAOperators "linear operators" for further details. * * @ingroup Matrix2 * @author Guido Kanschat diff --git a/include/deal.II/lac/linear_operator.h b/include/deal.II/lac/linear_operator.h index 59a39340f2..108d1f32b4 100644 --- a/include/deal.II/lac/linear_operator.h +++ b/include/deal.II/lac/linear_operator.h @@ -20,8 +20,6 @@ #include #include -#ifdef DEAL_II_WITH_CXX11 - #include #include #include @@ -144,10 +142,6 @@ null_operator(const LinearOperator &); * for linear operators have been provided within the respective * TrilinosWrappers (and, in the future, PetscWrappers) namespaces. * - * @note This class is only available if deal.II was configured with C++11 - * support, i.e., if DEAL_II_WITH_CXX11 is enabled during cmake - * configure. - * * @author Luca Heltai, Matthias Maier, 2015; Jean-Paul Pelteret, 2016 * * @ingroup LAOperators @@ -1302,5 +1296,4 @@ linear_operator(const OperatorExemplar &operator_exemplar, const Matrix &matrix) DEAL_II_NAMESPACE_CLOSE -#endif // DEAL_II_WITH_CXX11 #endif diff --git a/include/deal.II/lac/packaged_operation.h b/include/deal.II/lac/packaged_operation.h index 5db537acb0..d8029976b7 100644 --- a/include/deal.II/lac/packaged_operation.h +++ b/include/deal.II/lac/packaged_operation.h @@ -20,8 +20,6 @@ #include #include -#ifdef DEAL_II_WITH_CXX11 - #include DEAL_II_NAMESPACE_OPEN @@ -831,5 +829,4 @@ operator*(const PackagedOperation &comp, DEAL_II_NAMESPACE_CLOSE -#endif // DEAL_II_WITH_CXX11 #endif diff --git a/include/deal.II/lac/precondition.h b/include/deal.II/lac/precondition.h index 3d92b78eff..723078a450 100644 --- a/include/deal.II/lac/precondition.h +++ b/include/deal.II/lac/precondition.h @@ -1254,11 +1254,9 @@ template inline void PreconditionRichardson::vmult (VectorType &dst, const VectorType &src) const { -#ifdef DEAL_II_WITH_CXX11 static_assert( std::is_same::value, "PreconditionRichardson and VectorType must have the same size_type."); -#endif // DEAL_II_WITH_CXX11 dst.equ(relaxation,src); } @@ -1269,11 +1267,9 @@ template inline void PreconditionRichardson::Tvmult (VectorType &dst, const VectorType &src) const { -#ifdef DEAL_II_WITH_CXX11 static_assert( std::is_same::value, "PreconditionRichardson and VectorType must have the same size_type."); -#endif // DEAL_II_WITH_CXX11 dst.equ(relaxation,src); } @@ -1282,11 +1278,9 @@ template inline void PreconditionRichardson::vmult_add (VectorType &dst, const VectorType &src) const { -#ifdef DEAL_II_WITH_CXX11 static_assert( std::is_same::value, "PreconditionRichardson and VectorType must have the same size_type."); -#endif // DEAL_II_WITH_CXX11 dst.add(relaxation,src); } @@ -1297,11 +1291,9 @@ template inline void PreconditionRichardson::Tvmult_add (VectorType &dst, const VectorType &src) const { -#ifdef DEAL_II_WITH_CXX11 static_assert( std::is_same::value, "PreconditionRichardson and VectorType must have the same size_type."); -#endif // DEAL_II_WITH_CXX11 dst.add(relaxation,src); } @@ -1362,11 +1354,9 @@ template inline void PreconditionJacobi::vmult (VectorType &dst, const VectorType &src) const { -#ifdef DEAL_II_WITH_CXX11 static_assert( std::is_same::size_type, typename VectorType::size_type>::value, "PreconditionJacobi and VectorType must have the same size_type."); -#endif // DEAL_II_WITH_CXX11 Assert (this->A!=nullptr, ExcNotInitialized()); this->A->precondition_Jacobi (dst, src, this->relaxation); @@ -1379,11 +1369,9 @@ template inline void PreconditionJacobi::Tvmult (VectorType &dst, const VectorType &src) const { -#ifdef DEAL_II_WITH_CXX11 static_assert( std::is_same::size_type, typename VectorType::size_type>::value, "PreconditionJacobi and VectorType must have the same size_type."); -#endif // DEAL_II_WITH_CXX11 Assert (this->A!=nullptr, ExcNotInitialized()); this->A->precondition_Jacobi (dst, src, this->relaxation); @@ -1396,11 +1384,9 @@ template inline void PreconditionJacobi::step (VectorType &dst, const VectorType &src) const { -#ifdef DEAL_II_WITH_CXX11 static_assert( std::is_same::size_type, typename VectorType::size_type>::value, "PreconditionJacobi and VectorType must have the same size_type."); -#endif // DEAL_II_WITH_CXX11 Assert (this->A!=nullptr, ExcNotInitialized()); this->A->Jacobi_step (dst, src, this->relaxation); @@ -1413,11 +1399,9 @@ template inline void PreconditionJacobi::Tstep (VectorType &dst, const VectorType &src) const { -#ifdef DEAL_II_WITH_CXX11 static_assert( std::is_same::size_type, typename VectorType::size_type>::value, "PreconditionJacobi and VectorType must have the same size_type."); -#endif // DEAL_II_WITH_CXX11 step (dst, src); } @@ -1431,11 +1415,9 @@ template inline void PreconditionSOR::vmult (VectorType &dst, const VectorType &src) const { -#ifdef DEAL_II_WITH_CXX11 static_assert( std::is_same::size_type, typename VectorType::size_type>::value, "PreconditionSOR and VectorType must have the same size_type."); -#endif // DEAL_II_WITH_CXX11 Assert (this->A!=nullptr, ExcNotInitialized()); this->A->precondition_SOR (dst, src, this->relaxation); @@ -1448,11 +1430,9 @@ template inline void PreconditionSOR::Tvmult (VectorType &dst, const VectorType &src) const { -#ifdef DEAL_II_WITH_CXX11 static_assert( std::is_same::size_type, typename VectorType::size_type>::value, "PreconditionSOR and VectorType must have the same size_type."); -#endif // DEAL_II_WITH_CXX11 Assert (this->A!=nullptr, ExcNotInitialized()); this->A->precondition_TSOR (dst, src, this->relaxation); @@ -1465,11 +1445,9 @@ template inline void PreconditionSOR::step (VectorType &dst, const VectorType &src) const { -#ifdef DEAL_II_WITH_CXX11 static_assert( std::is_same::size_type, typename VectorType::size_type>::value, "PreconditionSOR and VectorType must have the same size_type."); -#endif // DEAL_II_WITH_CXX11 Assert (this->A!=nullptr, ExcNotInitialized()); this->A->SOR_step (dst, src, this->relaxation); @@ -1482,11 +1460,9 @@ template inline void PreconditionSOR::Tstep (VectorType &dst, const VectorType &src) const { -#ifdef DEAL_II_WITH_CXX11 static_assert( std::is_same::size_type, typename VectorType::size_type>::value, "PreconditionSOR and VectorType must have the same size_type."); -#endif // DEAL_II_WITH_CXX11 Assert (this->A!=nullptr, ExcNotInitialized()); this->A->TSOR_step (dst, src, this->relaxation); @@ -1535,11 +1511,9 @@ template inline void PreconditionSSOR::vmult (VectorType &dst, const VectorType &src) const { -#ifdef DEAL_II_WITH_CXX11 static_assert( std::is_same::size_type, typename VectorType::size_type>::value, "PreconditionSSOR and VectorType must have the same size_type."); -#endif // DEAL_II_WITH_CXX11 Assert (this->A!=nullptr, ExcNotInitialized()); this->A->precondition_SSOR (dst, src, this->relaxation, pos_right_of_diagonal); @@ -1552,11 +1526,9 @@ template inline void PreconditionSSOR::Tvmult (VectorType &dst, const VectorType &src) const { -#ifdef DEAL_II_WITH_CXX11 static_assert( std::is_same::size_type, typename VectorType::size_type>::value, "PreconditionSSOR and VectorType must have the same size_type."); -#endif // DEAL_II_WITH_CXX11 Assert (this->A!=nullptr, ExcNotInitialized()); this->A->precondition_SSOR (dst, src, this->relaxation, pos_right_of_diagonal); @@ -1569,11 +1541,9 @@ template inline void PreconditionSSOR::step (VectorType &dst, const VectorType &src) const { -#ifdef DEAL_II_WITH_CXX11 static_assert( std::is_same::size_type, typename VectorType::size_type>::value, "PreconditionSSOR and VectorType must have the same size_type."); -#endif // DEAL_II_WITH_CXX11 Assert (this->A!=nullptr, ExcNotInitialized()); this->A->SSOR_step (dst, src, this->relaxation); @@ -1586,11 +1556,9 @@ template inline void PreconditionSSOR::Tstep (VectorType &dst, const VectorType &src) const { -#ifdef DEAL_II_WITH_CXX11 static_assert( std::is_same::size_type, typename VectorType::size_type>::value, "PreconditionSSOR and VectorType must have the same size_type."); -#endif // DEAL_II_WITH_CXX11 step (dst, src); } @@ -1630,11 +1598,9 @@ template inline void PreconditionPSOR::vmult (VectorType &dst, const VectorType &src) const { -#ifdef DEAL_II_WITH_CXX11 static_assert( std::is_same::size_type, typename VectorType::size_type>::value, "PreconditionPSOR and VectorType must have the same size_type."); -#endif // DEAL_II_WITH_CXX11 Assert (this->A!=nullptr, ExcNotInitialized()); dst = src; @@ -1648,11 +1614,9 @@ template inline void PreconditionPSOR::Tvmult (VectorType &dst, const VectorType &src) const { -#ifdef DEAL_II_WITH_CXX11 static_assert( std::is_same::size_type, typename VectorType::size_type>::value, "PreconditionPSOR and VectorType must have the same size_type."); -#endif // DEAL_II_WITH_CXX11 Assert (this->A!=nullptr, ExcNotInitialized()); dst = src; @@ -2016,11 +1980,9 @@ PreconditionChebyshev::PreconditionChe delta (1.), is_initialized (false) { -#ifdef DEAL_II_WITH_CXX11 static_assert( std::is_same::value, "PreconditionChebyshev and VectorType must have the same size_type."); -#endif // DEAL_II_WITH_CXX11 } diff --git a/include/deal.II/lac/read_write_vector.h b/include/deal.II/lac/read_write_vector.h index 631125cfb7..9cb64ea562 100644 --- a/include/deal.II/lac/read_write_vector.h +++ b/include/deal.II/lac/read_write_vector.h @@ -202,7 +202,6 @@ namespace LinearAlgebra virtual void reinit (const IndexSet &locally_stored_indices, const bool omit_zeroing_entries = false); -#ifdef DEAL_II_WITH_CXX11 /** * Apply the functor @p func to each element of the vector. The functor * should look like @@ -218,7 +217,6 @@ namespace LinearAlgebra */ template void apply(const Functor &func); -#endif /** * Swap the contents of this vector and the other vector @p v. One could @@ -571,7 +569,6 @@ namespace LinearAlgebra */ template friend class ReadWriteVector; -#ifdef DEAL_II_WITH_CXX11 private: /** * This class provides a wrapper around a Functor which acts on @@ -605,7 +602,6 @@ namespace LinearAlgebra */ const Functor &functor; }; -#endif }; /*@}*/ @@ -881,7 +877,6 @@ namespace LinearAlgebra -#ifdef DEAL_II_WITH_CXX11 template template inline @@ -904,7 +899,6 @@ namespace LinearAlgebra for (size_type i=begin; i template void @@ -142,7 +141,6 @@ namespace LinearAlgebra FunctorTemplate functor(*this, func); internal::VectorOperations::parallel_for(functor, 0, n_elements(), thread_loop_partitioner); } -#endif diff --git a/include/deal.II/lac/schur_complement.h b/include/deal.II/lac/schur_complement.h index 0ef8e1cc86..2679af5382 100644 --- a/include/deal.II/lac/schur_complement.h +++ b/include/deal.II/lac/schur_complement.h @@ -22,7 +22,6 @@ #include #include -#ifdef DEAL_II_WITH_CXX11 DEAL_II_NAMESPACE_OPEN @@ -330,5 +329,4 @@ postprocess_schur_solution (const LinearOperator &A_ DEAL_II_NAMESPACE_CLOSE -#endif // DEAL_II_WITH_CXX11 #endif diff --git a/include/deal.II/lac/sparse_matrix.h b/include/deal.II/lac/sparse_matrix.h index ca128cafae..c73d56a39e 100644 --- a/include/deal.II/lac/sparse_matrix.h +++ b/include/deal.II/lac/sparse_matrix.h @@ -537,19 +537,14 @@ public: */ SparseMatrix (const SparseMatrix &); -#ifdef DEAL_II_WITH_CXX11 /** * Move constructor. Construct a new sparse matrix by transferring the * internal data of the matrix @p m into a new object. * * Move construction allows an object to be returned from a function or * packed into a tuple even when the class cannot be copy-constructed. - * - * @note this constructor is only available if deal.II is configured with - * C++11 support. */ SparseMatrix (SparseMatrix &&m); -#endif /** * Constructor. Takes the given matrix sparsity structure to represent the @@ -596,9 +591,6 @@ public: /** * Move assignment operator. This operator replaces the present matrix with * @p m by transferring the internal data of @p m. - * - * @note This operator is only available if deal.II is configured with C++11 - * support. */ SparseMatrix &operator = (SparseMatrix &&m); #endif diff --git a/include/deal.II/lac/sparse_matrix.templates.h b/include/deal.II/lac/sparse_matrix.templates.h index 316c5f75b2..bd1d517d9f 100644 --- a/include/deal.II/lac/sparse_matrix.templates.h +++ b/include/deal.II/lac/sparse_matrix.templates.h @@ -71,7 +71,6 @@ SparseMatrix::SparseMatrix (const SparseMatrix &m) -#ifdef DEAL_II_WITH_CXX11 template SparseMatrix::SparseMatrix (SparseMatrix &&m) : @@ -84,7 +83,6 @@ SparseMatrix::SparseMatrix (SparseMatrix &&m) m.val = nullptr; m.max_len = 0; } -#endif @@ -104,7 +102,6 @@ SparseMatrix::operator = (const SparseMatrix &m) -#ifdef DEAL_II_WITH_CXX11 template SparseMatrix & SparseMatrix::operator = (SparseMatrix &&m) @@ -119,7 +116,6 @@ SparseMatrix::operator = (SparseMatrix &&m) return *this; } -#endif diff --git a/include/deal.II/lac/trilinos_block_sparse_matrix.h b/include/deal.II/lac/trilinos_block_sparse_matrix.h index 4864876808..9753e38bb2 100644 --- a/include/deal.II/lac/trilinos_block_sparse_matrix.h +++ b/include/deal.II/lac/trilinos_block_sparse_matrix.h @@ -564,8 +564,6 @@ namespace TrilinosWrappers } -#ifdef DEAL_II_WITH_CXX11 - namespace internal { @@ -616,7 +614,6 @@ namespace TrilinosWrappers } /*namespace BlockLinearOperator*/ } /* namespace internal */ -#endif // DEAL_II_WITH_CXX11 }/* namespace TrilinosWrappers */ diff --git a/include/deal.II/lac/trilinos_linear_operator.h b/include/deal.II/lac/trilinos_linear_operator.h index c5cb9eecc8..d2b8d8fd87 100644 --- a/include/deal.II/lac/trilinos_linear_operator.h +++ b/include/deal.II/lac/trilinos_linear_operator.h @@ -18,7 +18,7 @@ #include -#if defined(DEAL_II_WITH_CXX11) && defined(DEAL_II_WITH_TRILINOS) +#if defined(DEAL_II_WITH_TRILINOS) #include #include @@ -222,5 +222,5 @@ namespace TrilinosWrappers DEAL_II_NAMESPACE_CLOSE -#endif // DEAL_II_WITH_CXX11 && DEAL_II_WITH_TRILINOS +#endif // DEAL_II_WITH_TRILINOS #endif diff --git a/include/deal.II/lac/trilinos_parallel_block_vector.h b/include/deal.II/lac/trilinos_parallel_block_vector.h index 9d5d3f3798..bf51547073 100644 --- a/include/deal.II/lac/trilinos_parallel_block_vector.h +++ b/include/deal.II/lac/trilinos_parallel_block_vector.h @@ -132,16 +132,11 @@ namespace TrilinosWrappers */ BlockVector (const BlockVector &v); -#ifdef DEAL_II_WITH_CXX11 /** * Move constructor. Creates a new vector by stealing the internal data * of the vector @p v. - * - * @note This constructor is only available if deal.II is configured - * with C++11 support. */ BlockVector (BlockVector &&v); -#endif /** * Creates a block vector consisting of num_blocks components, @@ -166,16 +161,11 @@ namespace TrilinosWrappers */ BlockVector &operator= (const BlockVector &v); -#ifdef DEAL_II_WITH_CXX11 /** * Move the given vector. This operator replaces the present vector with * @p v by efficiently swapping the internal data structures. - * - * @note This operator is only available if deal.II is configured with - * C++11 support. */ BlockVector &operator= (BlockVector &&v); -#endif /** * Copy operator for arguments of the localized Trilinos vector type. @@ -400,7 +390,6 @@ namespace TrilinosWrappers -#ifdef DEAL_II_WITH_CXX11 inline BlockVector::BlockVector (BlockVector &&v) { @@ -408,7 +397,6 @@ namespace TrilinosWrappers reinit (0); swap(v); } -#endif diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h index 36cb54b780..fb79c1ebd7 100644 --- a/include/deal.II/lac/trilinos_sparse_matrix.h +++ b/include/deal.II/lac/trilinos_sparse_matrix.h @@ -28,12 +28,9 @@ # include # include # include +# include -#ifdef DEAL_II_WITH_CXX11 -#include -#include -#endif // DEAL_II_WITH_CXX11 - +# include # include # include # include @@ -2047,7 +2044,6 @@ namespace TrilinosWrappers }; -#ifdef DEAL_II_WITH_CXX11 // forwards declarations class SolverBase; @@ -2523,7 +2519,6 @@ namespace TrilinosWrappers } /* namespace LinearOperator */ } /* namespace internal */ -#endif // DEAL_II_WITH_CXX11 // -------------------------- inline and template functions ---------------------- @@ -3173,7 +3168,6 @@ namespace TrilinosWrappers } -#ifdef DEAL_II_WITH_CXX11 namespace internal { namespace LinearOperator @@ -3262,7 +3256,6 @@ namespace TrilinosWrappers } } // namespace LinearOperator } // namespace internal -#endif // DEAL_II_WITH_CXX11 #endif // DOXYGEN diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h index fa99de015a..28f746750d 100644 --- a/include/deal.II/lac/trilinos_vector.h +++ b/include/deal.II/lac/trilinos_vector.h @@ -291,16 +291,11 @@ namespace TrilinosWrappers */ Vector (const Vector &v); -#ifdef DEAL_II_WITH_CXX11 /** * Move constructor. Creates a new vector by stealing the internal data * of the vector @p v. - * - * @note This constructor is only available if deal.II is configured - * with C++11 support. */ Vector (Vector &&v); -#endif /** * Destructor. @@ -355,16 +350,11 @@ namespace TrilinosWrappers */ Vector &operator= (const Vector &v); -#ifdef DEAL_II_WITH_CXX11 /** * Move the given vector. This operator replaces the present vector with * @p v by efficiently swapping the internal data structures. - * - * @note This operator is only available if deal.II is configured with - * C++11 support. */ Vector &operator= (Vector &&v); -#endif /** * Copy operator from a given localized vector (present on all diff --git a/include/deal.II/lac/vector.h b/include/deal.II/lac/vector.h index 7f6431c34e..6410f8cba1 100644 --- a/include/deal.II/lac/vector.h +++ b/include/deal.II/lac/vector.h @@ -196,17 +196,11 @@ public: */ Vector (const Vector &v); -#ifdef DEAL_II_WITH_CXX11 /** * Move constructor. Creates a new vector by stealing the internal data of * the vector @p v. - * - * @note This constructor is only available if deal.II is configured with - * C++11 support. */ Vector (Vector &&v); -#endif - #ifndef DEAL_II_EXPLICIT_CONSTRUCTOR_BUG /** @@ -383,9 +377,6 @@ public: * 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. - * - * @note This operator is only available if deal.II is configured with C++11 - * support. */ Vector &operator= (Vector &&v); #endif diff --git a/include/deal.II/lac/vector.templates.h b/include/deal.II/lac/vector.templates.h index 674404dcbf..38554edc26 100644 --- a/include/deal.II/lac/vector.templates.h +++ b/include/deal.II/lac/vector.templates.h @@ -59,7 +59,6 @@ Vector::Vector (const Vector &v) -#ifdef DEAL_II_WITH_CXX11 template Vector::Vector (Vector &&v) : @@ -73,7 +72,6 @@ Vector::Vector (Vector &&v) v.max_vec_size = 0; v.val = nullptr; } -#endif diff --git a/source/lac/trilinos_block_vector.cc b/source/lac/trilinos_block_vector.cc index 811dc943fa..8897cb05a9 100644 --- a/source/lac/trilinos_block_vector.cc +++ b/source/lac/trilinos_block_vector.cc @@ -76,14 +76,12 @@ namespace TrilinosWrappers -#ifdef DEAL_II_WITH_CXX11 BlockVector & BlockVector::operator= (BlockVector &&v) { swap(v); return *this; } -#endif diff --git a/source/lac/trilinos_sparse_matrix.cc b/source/lac/trilinos_sparse_matrix.cc index 9081b440be..69fe10bba6 100644 --- a/source/lac/trilinos_sparse_matrix.cc +++ b/source/lac/trilinos_sparse_matrix.cc @@ -24,10 +24,7 @@ # include # include # include - -#ifdef DEAL_II_WITH_CXX11 # include -#endif DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include @@ -2501,7 +2498,6 @@ namespace TrilinosWrappers } } -#ifdef DEAL_II_WITH_CXX11 namespace TrilinosWrappers { @@ -3400,7 +3396,6 @@ namespace TrilinosWrappers } /* namespace internal */ } /* namespace TrilinosWrappers */ -#endif // DEAL_II_WITH_CXX11 // explicit instantiations diff --git a/source/lac/trilinos_vector.cc b/source/lac/trilinos_vector.cc index 9858a5d9f8..50e454b0fa 100644 --- a/source/lac/trilinos_vector.cc +++ b/source/lac/trilinos_vector.cc @@ -127,7 +127,6 @@ namespace TrilinosWrappers -#ifdef DEAL_II_WITH_CXX11 Vector::Vector (Vector &&v) { // initialize a minimal, valid object and swap @@ -137,7 +136,6 @@ namespace TrilinosWrappers swap(v); } -#endif @@ -566,13 +564,11 @@ namespace TrilinosWrappers -#ifdef DEAL_II_WITH_CXX11 Vector &Vector::operator= (Vector &&v) { swap(v); return *this; } -#endif diff --git a/tests/base/cell_data_storage_01.cc b/tests/base/cell_data_storage_01.cc index 683bbfec5a..3b97d750ac 100644 --- a/tests/base/cell_data_storage_01.cc +++ b/tests/base/cell_data_storage_01.cc @@ -20,8 +20,6 @@ #include "../tests.h" -#ifdef DEAL_II_WITH_CXX11 - #include #include #include @@ -160,12 +158,3 @@ int main(int argc, char *argv[]) test<2>(); } - -#else -int main(int argc, char *argv[]) -{ - Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - initlog(); - deallog << "Ok" << std::endl; -} -#endif diff --git a/tests/base/cell_data_storage_02.cc b/tests/base/cell_data_storage_02.cc index 8c0f2a84a8..60b9e87a01 100644 --- a/tests/base/cell_data_storage_02.cc +++ b/tests/base/cell_data_storage_02.cc @@ -20,8 +20,6 @@ #include "../tests.h" -#ifdef DEAL_II_WITH_CXX11 - #include #include #include @@ -141,12 +139,3 @@ int main(int argc, char *argv[]) test<2>(); } - -#else -int main(int argc, char *argv[]) -{ - Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - initlog(); - deallog << "Ok" << std::endl; -} -#endif diff --git a/tests/base/quadrature_point_data_02.cc b/tests/base/quadrature_point_data_02.cc index 2dbb269c7a..f60677db2b 100644 --- a/tests/base/quadrature_point_data_02.cc +++ b/tests/base/quadrature_point_data_02.cc @@ -24,7 +24,6 @@ #include "../tests.h" -#ifdef DEAL_II_WITH_CXX11 #include #include #include @@ -219,15 +218,3 @@ int main(int argc, char *argv[]) test<2>(); } - -#else -int main(int argc, char *argv[]) -{ - Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - mpi_initlog(); - - deallog << "Ok" << std::endl; -} - - -#endif diff --git a/tests/base/quadrature_point_data_03.cc b/tests/base/quadrature_point_data_03.cc index 4642896d61..24cdab3426 100644 --- a/tests/base/quadrature_point_data_03.cc +++ b/tests/base/quadrature_point_data_03.cc @@ -20,7 +20,6 @@ #include "../tests.h" -#ifdef DEAL_II_WITH_CXX11 #include #include #include @@ -224,15 +223,3 @@ int main(int argc, char *argv[]) test<2>(); } - -#else -int main(int argc, char *argv[]) -{ - Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - mpi_initlog(); - - deallog << "Ok" << std::endl; -} - - -#endif diff --git a/tests/base/tensor_accessors_02.cc b/tests/base/tensor_accessors_02.cc index 2e7880b3b0..c097ca1063 100644 --- a/tests/base/tensor_accessors_02.cc +++ b/tests/base/tensor_accessors_02.cc @@ -18,9 +18,7 @@ #include #include -#ifdef DEAL_II_WITH_CXX11 #include -#endif int main() { @@ -77,12 +75,8 @@ int main() // via std::array // via std::array: -#ifdef DEAL_II_WITH_CXX11 std::array temp {{2, 1, 0, 2, 1}}; deallog << TensorAccessors::extract<5>(foo, temp) << std::endl; -#else - deallog << 42. << std::endl; -#endif } } diff --git a/tests/base/unique_ptr_01.cc b/tests/base/unique_ptr_01.cc index af5ed55fdb..ea890453ba 100644 --- a/tests/base/unique_ptr_01.cc +++ b/tests/base/unique_ptr_01.cc @@ -72,7 +72,6 @@ int main () // test with plain unique_ptr, but also copy stuff. this only works // with move constructors, so test only in C++11 mode -#ifdef DEAL_II_WITH_CXX11 { AssertThrow (counter == 0, ExcInternalError()); { @@ -84,7 +83,6 @@ int main () } AssertThrow (counter == 0, ExcInternalError()); } -#endif deallog << "OK" << std::endl; }