From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Tue, 16 Jan 2018 16:50:59 +0000 (+0100)
Subject: Make parameters and variables for the internal::AlignedVector classes const
X-Git-Tag: v9.0.0-rc1~562^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfba579cf5b42d3859635baa43a5f67b4b8264de;p=dealii.git

Make parameters and variables for the internal::AlignedVector classes const
---

diff --git a/include/deal.II/base/aligned_vector.h b/include/deal.II/base/aligned_vector.h
index 2eca6eb434..ed636772c5 100644
--- a/include/deal.II/base/aligned_vector.h
+++ b/include/deal.II/base/aligned_vector.h
@@ -355,14 +355,15 @@ namespace internal
      * The elements from the source array are simply copied via the placement
      * new copy constructor.
      */
-    AlignedVectorCopy (T *source_begin,
-                       T *source_end,
-                       T *destination)
+    AlignedVectorCopy (const T *const source_begin,
+                       const T *const source_end,
+                       T *const destination)
       :
       source_ (source_begin),
       destination_ (destination)
     {
       Assert (source_end >= source_begin, ExcInternalError());
+      Assert (source_end == source_begin || destination != nullptr, ExcInternalError());
       const std::size_t size = source_end - source_begin;
       if (size < minimum_parallel_grain_size)
         apply_to_subrange (0, size);
@@ -393,8 +394,8 @@ namespace internal
     }
 
   private:
-    T *source_;
-    T *destination_;
+    const T *const source_;
+    T *const destination_;
   };
 
 
@@ -417,14 +418,15 @@ namespace internal
      * The data is moved between the two arrays by invoking the destructor on
      * the source range (preparing for a subsequent call to free).
      */
-    AlignedVectorMove (T *source_begin,
-                       T *source_end,
-                       T *destination)
+    AlignedVectorMove (T *const source_begin,
+                       T *const source_end,
+                       T *const destination)
       :
       source_ (source_begin),
       destination_ (destination)
     {
       Assert (source_end >= source_begin, ExcInternalError());
+      Assert (source_end == source_begin || destination != nullptr, ExcInternalError());
       const std::size_t size = source_end - source_begin;
       if (size < minimum_parallel_grain_size)
         apply_to_subrange (0, size);
@@ -460,8 +462,8 @@ namespace internal
     }
 
   private:
-    T *source_;
-    T *destination_;
+    T *const source_;
+    T *const destination_;
   };
 
 
@@ -487,7 +489,7 @@ namespace internal
      */
     AlignedVectorSet (const std::size_t size,
                       const T &element,
-                      T *destination)
+                      T *const destination)
       :
       element_ (element),
       destination_ (destination),
@@ -495,6 +497,7 @@ namespace internal
     {
       if (size == 0)
         return;
+      Assert (destination != nullptr, ExcInternalError());
 
       // do not use memcmp for long double because on some systems it does not
       // completely fill its memory and may lead to false positives in
@@ -579,12 +582,13 @@ namespace internal
      * elements, otherwise work in serial.
      */
     AlignedVectorDefaultInitialize (const std::size_t size,
-                                    T *destination)
+                                    T *const destination)
       :
       destination_ (destination)
     {
       if (size == 0)
         return;
+      Assert (destination != nullptr, ExcInternalError());
 
       if (size < minimum_parallel_grain_size)
         apply_to_subrange (0, size);