Address Martin K's comments in review of this patch.

diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h
index 1425289e158b651ef80eada0e3f50ef9da4d62c4..06b628d375e53892be1d075ebb0bff8e5d9226e9 100644 (file)
--- a/include/deal.II/base/tensor.h
+++ b/include/deal.II/base/tensor.h
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 1998 - 2014 by the deal.II authors
+// Copyright (C) 1998 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -103,16 +103,18 @@ public:
   Tensor (const array_type &initializer);
 
   /**
-   * Copy constructor taking a tesnor of another base data type
+   * Copy constructor from tensors with different underlying scalar
+   * type. This obviously requires that the @p OtherNumber type is
+   * convertible to @p Number.
    */
   template <typename OtherNumber>
   explicit
-  Tensor (const Tensor<rank_,dim,OtherNumber> &);
+  Tensor (const Tensor<rank_,dim,OtherNumber> &initializer);
 
   /**
    * Conversion operator from tensor of tensors.
    */
-  Tensor (const Tensor<1,dim,Tensor<rank_-1,dim,Number> > &tensor_in);
+  Tensor (const Tensor<1,dim,Tensor<rank_-1,dim,Number> > &initializer);
 
   /**
    * Conversion operator to tensor of tensors.
@@ -142,10 +144,15 @@ public:
   /**
    * Assignment operator.
    */
-  Tensor &operator = (const Tensor<rank_,dim,Number> &);
+  Tensor &operator = (const Tensor<rank_,dim,Number> &rhs);
 
+  /**
+   * Assignment operator from tensors with different underlying scalar
+   * type. This obviously requires that the @p OtherNumber type is
+   * convertible to @p Number.
+   */
   template <typename OtherNumber>
-  Tensor &operator = (const Tensor<rank_,dim,OtherNumber> &);
+  Tensor &operator = (const Tensor<rank_,dim,OtherNumber> &rhs);
 
   /**
    * This operator assigns a scalar to a tensor. To avoid confusion with what
@@ -373,6 +380,8 @@ Tensor<rank_,dim,Number>::operator[] (const unsigned int i) const
   return subtensor[i];
 }
 
+
+
 template <int rank_, int dim, typename Number>
 inline
 Number
@@ -387,6 +396,8 @@ Tensor<rank_,dim,Number>::operator[] (const TableIndices<rank_> &indices) const
   return (subtensor[inner_ind])[indices1];
 }
 
+
+
 template <int rank_, int dim, typename Number>
 inline
 Number &
@@ -401,6 +412,8 @@ Tensor<rank_,dim,Number>::operator[] (const TableIndices<rank_> &indices)
   return (subtensor[inner_ind])[indices1];
 }
 
+
+
 template <int rank_, int dim, typename Number>
 inline
 Tensor<rank_,dim,Number> &
@@ -424,6 +437,8 @@ Tensor<rank_,dim,Number>::operator = (const Tensor<rank_,dim,OtherNumber> &t)
   return *this;
 }
 
+
+
 template <int rank_, int dim, typename Number>
 template <typename OtherNumber>
 Tensor<rank_,dim,Number>::Tensor (const Tensor<rank_,dim,OtherNumber> &t)

diff --git a/include/deal.II/base/tensor_base.h b/include/deal.II/base/tensor_base.h
index c4b5f46cab7f52f4b45a06f1017c2c39843b1988..eaed5b2f81d00f84c7ef94e13158b6896907fcc5 100644 (file)
--- a/include/deal.II/base/tensor_base.h
+++ b/include/deal.II/base/tensor_base.h
@@ -113,7 +113,7 @@ public:
   /**
    * Copy constructor.
    */
-  Tensor (const Tensor<0,dim,Number> &);
+  Tensor (const Tensor<0,dim,Number> &initializer);
 
   /**
    * Copy constructor from tensors with different underlying scalar
@@ -121,7 +121,8 @@ public:
    * convertible to @p Number.
    */
   template <typename OtherNumber>
-  Tensor (const Tensor<0,dim,OtherNumber> &);
+  explicit
+  Tensor (const Tensor<0,dim,OtherNumber> &initializer);
 
   /**
    * Conversion to Number. Since rank-0 tensors are scalars, this is a natural
@@ -141,7 +142,7 @@ public:
   /**
    * Assignment operator.
    */
-  Tensor<0,dim,Number> &operator = (const Tensor<0,dim,Number> &);
+  Tensor<0,dim,Number> &operator = (const Tensor<0,dim,Number> &rhs);
 
   /**
    * Assignment operator from tensors with different underlying scalar
@@ -149,7 +150,7 @@ public:
    * convertible to @p Number.
    */
   template <typename OtherNumber>
-  Tensor<0,dim,Number> &operator = (const Tensor<0,dim,OtherNumber> &);
+  Tensor<0,dim,Number> &operator = (const Tensor<0,dim,OtherNumber> &rhs);
 
   /**
    * Assignment operator.
@@ -159,22 +160,22 @@ public:
   /**
    * Test for equality of two tensors.
    */
-  bool operator == (const Tensor<0,dim,Number> &) const;
+  bool operator == (const Tensor<0,dim,Number> &rhs) const;
 
   /**
    * Test for inequality of two tensors.
    */
-  bool operator != (const Tensor<0,dim,Number> &) const;
+  bool operator != (const Tensor<0,dim,Number> &rhs) const;
 
   /**
    * Add another vector, i.e. move this point by the given offset.
    */
-  Tensor<0,dim,Number> &operator += (const Tensor<0,dim,Number> &);
+  Tensor<0,dim,Number> &operator += (const Tensor<0,dim,Number> &rhs);
 
   /**
    * Subtract another vector.
    */
-  Tensor<0,dim,Number> &operator -= (const Tensor<0,dim,Number> &);
+  Tensor<0,dim,Number> &operator -= (const Tensor<0,dim,Number> &rhs);
 
   /**
    * Scale the vector by <tt>factor</tt>, i.e. multiply all coordinates by
@@ -342,7 +343,8 @@ public:
    * Constructor. Initialize all entries to zero if <tt>initialize==true</tt>;
    * this is the default behaviour.
    */
-  explicit Tensor (const bool initialize = true);
+  explicit
+  Tensor (const bool initialize = true);
 
   /**
    * Copy constructor, where the data is copied from a C-style array.
@@ -352,7 +354,7 @@ public:
   /**
    * Copy constructor.
    */
-  Tensor (const Tensor<1,dim,Number> &);
+  Tensor (const Tensor<1,dim,Number> &initializer);
 
   /**
    * Copy constructor from tensors with different underlying scalar
@@ -360,7 +362,8 @@ public:
    * convertible to @p Number.
    */
   template <typename OtherNumber>
-  Tensor (const Tensor<1,dim,OtherNumber> &);
+  explicit
+  Tensor (const Tensor<1,dim,OtherNumber> &initializer);
 
   /**
    * Read access to the <tt>index</tt>th coordinate.
@@ -391,7 +394,7 @@ public:
   /**
    * Assignment operator.
    */
-  Tensor<1,dim,Number> &operator = (const Tensor<1,dim,Number> &);
+  Tensor<1,dim,Number> &operator = (const Tensor<1,dim,Number> &rhs);
 
   /**
    * Assignment operator from tensors with different underlying scalar
@@ -399,7 +402,7 @@ public:
    * convertible to @p Number.
    */
   template <typename OtherNumber>
-  Tensor<1,dim,Number> &operator = (const Tensor<1,dim,OtherNumber> &);
+  Tensor<1,dim,Number> &operator = (const Tensor<1,dim,OtherNumber> &rhs);
 
   /**
    * This operator assigns a scalar to a tensor. To avoid confusion with what
@@ -412,22 +415,22 @@ public:
   /**
    * Test for equality of two tensors.
    */
-  bool operator == (const Tensor<1,dim,Number> &) const;
+  bool operator == (const Tensor<1,dim,Number> &rhs) const;
 
   /**
    * Test for inequality of two tensors.
    */
-  bool operator != (const Tensor<1,dim,Number> &) const;
+  bool operator != (const Tensor<1,dim,Number> &rhs) const;
 
   /**
    * Add another vector, i.e. move this point by the given offset.
    */
-  Tensor<1,dim,Number> &operator += (const Tensor<1,dim,Number> &);
+  Tensor<1,dim,Number> &operator += (const Tensor<1,dim,Number> &rhs);
 
   /**
    * Subtract another vector.
    */
-  Tensor<1,dim,Number> &operator -= (const Tensor<1,dim,Number> &);
+  Tensor<1,dim,Number> &operator -= (const Tensor<1,dim,Number> &rhs);
 
   /**
    * Scale the vector by <tt>factor</tt>, i.e. multiply all coordinates by