Fix for MSVC: Tensor<1, dim, Number>::real_type -> numbers::NumberTraits<Number>...

    - if left as is, MSVC 2013 Pro issues (although it should not) an error 'incompatible declaration <-> definition'.

diff --git a/include/deal.II/base/point.h b/include/deal.II/base/point.h
index 177011c85ae508c31f921e9cf5ed87517b340666..eb12b137546d4b14ac1496c989caa3d7552b4524 100644 (file)
--- a/include/deal.II/base/point.h
+++ b/include/deal.II/base/point.h
@@ -218,14 +218,14 @@ public:
    * Tensor<rank,dim,Number>::norm_square() which returns the square of the
    * Frobenius norm.
    */
-  typename Tensor<1, dim, Number>::real_type square () const;
+  typename numbers::NumberTraits<Number>::real_type square () const;
 
   /**
    * Return the Euclidean distance of <tt>this</tt> point to the point
    * <tt>p</tt>, i.e. the <tt>l_2</tt> norm of the difference between the
    * vectors representing the two points.
    */
-  typename Tensor<1, dim, Number>::real_type distance (const Point<dim,Number> &p) const;
+  typename numbers::NumberTraits<Number>::real_type distance (const Point<dim,Number> &p) const;
 
   /**
    * @}
@@ -428,7 +428,7 @@ Point<dim,Number>::operator * (const Tensor<1,dim,Number> &p) const
 
 template <int dim, typename Number>
 inline
-typename Tensor<1, dim, Number>::real_type
+typename numbers::NumberTraits<Number>::real_type
 Point<dim,Number>::square () const
 {
   return this->norm_square();
@@ -438,7 +438,7 @@ Point<dim,Number>::square () const
 
 template <int dim, typename Number>
 inline
-typename Tensor<1, dim, Number>::real_type
+typename numbers::NumberTraits<Number>::real_type
 Point<dim,Number>::distance (const Point<dim,Number> &p) const
 {
   Number sum = Number();

diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h
index 1f75f7a7da1c0e7bd3b0cfe31374acde911c0e07..27201bd327e149f0dae5160685f04e22bdc31c41 100644 (file)
--- a/include/deal.II/base/tensor.h
+++ b/include/deal.II/base/tensor.h
@@ -351,16 +351,6 @@ public:
   static const unsigned int
   n_independent_components = Tensor<rank_-1,dim>::n_independent_components *dim;
 
-  /**
-   * Declare a type that holds real-valued numbers with the same precision
-   * as the template argument to this class. For std::complex<number>, this
-   * corresponds to type number, and it is equal to Number for all other
-   * cases. See also the respective field in Vector<Number>.
-   *
-   * This typedef is used to represent the return type of norms.
-   */
-  typedef typename numbers::NumberTraits<Number>::real_type real_type;
-
   /**
    * Type of objects encapsulated by this container and returned by
    * operator[](). This is a tensor of lower rank for a general tensor, and
@@ -515,13 +505,14 @@ public:
    * tensors, this equals the usual <tt>l<sub>2</sub></tt> norm of the
    * vector.
    */
-  real_type norm () const;
+
+  typename numbers::NumberTraits<Number>::real_type norm() const;
 
   /**
    * Return the square of the Frobenius-norm of a tensor, i.e. the sum of
    * the absolute squares of all entries.
    */
-  real_type norm_square () const;
+  typename numbers::NumberTraits<Number>::real_type norm_square() const;
 
   /**
    * Fill a vector with all tensor elements.
@@ -1065,7 +1056,7 @@ Tensor<rank_,dim,Number>::operator - () const
 
 template <int rank_, int dim, typename Number>
 inline
-typename Tensor<rank_,dim,Number>::real_type
+typename numbers::NumberTraits<Number>::real_type
 Tensor<rank_,dim,Number>::norm () const
 {
   return std::sqrt (norm_square());
@@ -1074,10 +1065,10 @@ Tensor<rank_,dim,Number>::norm () const
 
 template <int rank_, int dim, typename Number>
 inline
-typename Tensor<rank_,dim,Number>::real_type
+typename numbers::NumberTraits<Number>::real_type
 Tensor<rank_,dim,Number>::norm_square () const
 {
-  real_type s = real_type();
+  typename numbers::NumberTraits<Number>::real_type s = typename numbers::NumberTraits<Number>::real_type();
   for (unsigned int i=0; i<dim; ++i)
     s += values[i].norm_square();