From 7964f63d03f6ac279632af340dda314e5c54980a Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Wed, 4 Oct 2017 21:48:35 -0600 Subject: [PATCH] Simplify code by omitting members that are now always either trueor false. --- include/deal.II/base/aligned_vector.h | 56 +++++++++------------------ 1 file changed, 18 insertions(+), 38 deletions(-) diff --git a/include/deal.II/base/aligned_vector.h b/include/deal.II/base/aligned_vector.h index c18719e32e..f1c46b56c5 100644 --- a/include/deal.II/base/aligned_vector.h +++ b/include/deal.II/base/aligned_vector.h @@ -350,20 +350,17 @@ namespace internal * Constructor. Issues a parallel call if there are sufficiently many * elements, otherwise works in serial. Copies the data from the half-open * interval between @p source_begin and @p source_end to array starting at - * @p destination (by calling the copy constructor with placement new). If - * the flag copy_source is set to @p true, the elements from the source - * array are simply copied. If it is set to @p false, the data is moved - * between the two arrays by invoking the destructor on the source range - * (preparing for a subsequent call to free). + * @p destination (by calling the copy constructor with placement new). + * + * The elements from the source array are simply copied via the placement + * new copy constructor. */ AlignedVectorCopy (T *source_begin, T *source_end, - T *destination, - const bool copy_source) + T *destination) : source_ (source_begin), - destination_ (destination), - copy_source_ (copy_source) + destination_ (destination) { Assert (source_end >= source_begin, ExcInternalError()); const std::size_t size = source_end - source_begin; @@ -390,15 +387,6 @@ namespace internal if (std::is_trivial::value == true) std::memcpy ((void *)(destination_+begin), (void *)(source_+begin), (end-begin)*sizeof(T)); - else if (copy_source_ == false) - for (std::size_t i=begin; i= source_begin, ExcInternalError()); const std::size_t size = source_end - source_begin; @@ -465,7 +449,7 @@ namespace internal if (std::is_trivial::value == true) std::memcpy ((void *)(destination_+begin), (void *)(source_+begin), (end-begin)*sizeof(T)); - else if (copy_source_ == false) + else for (std::size_t i=begin; i::AlignedVector (const AlignedVector &vec) // copy the data from vec reserve (vec._end_data - vec._data); _end_data = _end_allocated; - internal::AlignedVectorCopy (vec._data, vec._end_data, _data, true); + internal::AlignedVectorCopy (vec._data, vec._end_data, _data); } @@ -746,7 +726,7 @@ AlignedVector::operator = (const AlignedVector &vec) { resize(0); resize_fast (vec._end_data - vec._data); - internal::AlignedVectorCopy (vec._data, vec._end_data, _data, true); + internal::AlignedVectorCopy (vec._data, vec._end_data, _data); return *this; } @@ -877,7 +857,7 @@ AlignedVector::reserve (const size_type size_alloc) if (_end_data != _data) { dealii::internal::AlignedVectorMove(new_data, new_data + old_size, - _data, false); + _data); free(new_data); } else -- 2.39.5