From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Thu, 10 Sep 2015 02:36:38 +0000 (-0500)
Subject: Avoid a whole lot of warnings.
X-Git-Tag: v8.4.0-rc2~447^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1573%2Fhead;p=dealii.git

Avoid a whole lot of warnings.

These warnings are about accessing elements of a zero sized
array as well as comparisons of the form 'i<dim' if 'dim==0'.
---

diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h
index 4def2b2bbe..cf52223b03 100644
--- a/include/deal.II/base/tensor.h
+++ b/include/deal.II/base/tensor.h
@@ -848,8 +848,8 @@ template <int rank_, int dim, typename Number>
 inline
 Tensor<rank_,dim,Number>::Tensor (const Tensor<rank_,dim,Number> &initializer)
 {
-  for (unsigned int i=0; i<dim; ++i)
-    values[i] = initializer[i];
+  if (dim > 0)
+    std::copy (&initializer[0], &initializer[0]+dim, &values[0]);
 }
 
 
@@ -893,14 +893,69 @@ operator Tensor<1,dim,Tensor<rank_-1,dim,OtherNumber> > () const
 }
 
 
+
+namespace internal
+{
+  namespace TensorSubscriptor
+  {
+    namespace
+    {
+      template <typename ArrayElementType, int dim>
+      ArrayElementType &
+      subscript (ArrayElementType *values,
+                 const unsigned int i,
+                 dealii::internal::int2type<dim>)
+      {
+        Assert (i<dim, ExcIndexRange(i, 0, dim));
+        return values[i];
+      }
+
+
+      template <typename ArrayElementType, int dim>
+      const ArrayElementType &
+      subscript (const ArrayElementType *values,
+                 const unsigned int i,
+                 dealii::internal::int2type<dim>)
+      {
+        Assert (i<dim, ExcIndexRange(i, 0, dim));
+        return values[i];
+      }
+
+
+      template <typename ArrayElementType>
+      ArrayElementType &
+      subscript (ArrayElementType *,
+                 const unsigned int,
+                 dealii::internal::int2type<0>)
+      {
+        Assert(false, ExcMessage("Cannot access elements of an object of type Tensor<rank,0,Number>."));
+        static ArrayElementType t;
+        return t;
+      }
+
+
+      template <typename ArrayElementType>
+      const ArrayElementType &
+      subscript (const ArrayElementType *,
+                 const unsigned int,
+                 dealii::internal::int2type<0>)
+      {
+        Assert(false, ExcMessage("Cannot access elements of an object of type Tensor<rank,0,Number>."));
+        static ArrayElementType t;
+        return t;
+      }
+
+    }
+  }
+}
+
+
 template <int rank_, int dim, typename Number>
 inline
 typename Tensor<rank_,dim,Number>::value_type &
 Tensor<rank_,dim,Number>::operator[] (const unsigned int i)
 {
-  Assert(dim != 0, ExcMessage("Cannot access an object of type Tensor<rank_,0,Number>"));
-  Assert (i<dim, ExcIndexRange(i, 0, dim));
-  return values[i];
+  return internal::TensorSubscriptor::subscript(values, i, internal::int2type<dim>());
 }
 
 
@@ -909,9 +964,7 @@ inline
 const typename Tensor<rank_,dim,Number>::value_type &
 Tensor<rank_,dim,Number>::operator[] (const unsigned int i) const
 {
-  Assert(dim != 0, ExcMessage("Cannot access an object of type Tensor<rank_,0,Number>"));
-  Assert (i<dim, ExcIndexRange(i, 0, dim));
-  return values[i];
+  return internal::TensorSubscriptor::subscript(values, i, internal::int2type<dim>());
 }
 
 
@@ -942,8 +995,8 @@ inline
 Tensor<rank_,dim,Number> &
 Tensor<rank_,dim,Number>::operator = (const Tensor<rank_,dim,Number> &t)
 {
-  for (unsigned int i=0; i<dim; ++i)
-    values[i] = t.values[i];
+  if (dim > 0)
+    std::copy (&t.values[0], &t.values[0]+dim, &values[0]);
   return *this;
 }
 
@@ -954,8 +1007,8 @@ inline
 Tensor<rank_,dim,Number> &
 Tensor<rank_,dim,Number>::operator = (const Tensor<rank_,dim,OtherNumber> &t)
 {
-  for (unsigned int i=0; i<dim; ++i)
-    values[i] = t.values[i];
+  if (dim > 0)
+    std::copy (&t.values[0], &t.values[0]+dim, &values[0]);
   return *this;
 }