From: Matthias Maier <tamiko@43-1.org>
Date: Mon, 7 Sep 2015 04:42:48 +0000 (-0500)
Subject: Bugfix: Avoid C++11 only syntax
X-Git-Tag: v8.4.0-rc2~466^2~7
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7564427cf197507887429299151dd66870a9c010;p=dealii.git

Bugfix: Avoid C++11 only syntax
---

diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h
index 28100f3110..7a52daf46f 100644
--- a/include/deal.II/base/tensor.h
+++ b/include/deal.II/base/tensor.h
@@ -1242,12 +1242,9 @@ std::ostream &operator << (std::ostream &out, const Tensor<0,dim,Number> &p)
  * @relates Tensor<0,dim,Number>
  * @relates EnableIfScalar
  */
-template <int dim,
-          typename Number,
-          typename OtherNumber,
-          typename = typename EnableIfScalar<OtherNumber>::type>
+template <int dim, typename Number, typename OtherNumber>
 inline
-Tensor<0,dim,typename ProductType<OtherNumber, Number>::type>
+Tensor<0,dim,typename ProductType<typename EnableIfScalar<OtherNumber>::type, Number>::type>
 operator * (const OtherNumber           factor,
             const Tensor<0,dim,Number> &t)
 {
@@ -1261,12 +1258,9 @@ operator * (const OtherNumber           factor,
  * @relates Tensor<0,dim,Number>
  * @relates EnableIfScalar
  */
-template <int dim,
-          typename Number,
-          typename OtherNumber,
-          typename = typename EnableIfScalar<OtherNumber>::type>
+template <int dim, typename Number, typename OtherNumber>
 inline
-Tensor<0,dim,typename ProductType<Number, OtherNumber>::type>
+Tensor<0,dim,typename ProductType<Number, typename EnableIfScalar<OtherNumber>::type>::type>
 operator * (const Tensor<0,dim,Number> &t,
             const OtherNumber           factor)
 {
@@ -1280,12 +1274,9 @@ operator * (const Tensor<0,dim,Number> &t,
  * @relates Tensor<0,dim,Number>
  * @relates EnableIfScalar
  */
-template <int dim,
-          typename Number,
-          typename OtherNumber,
-          typename = typename EnableIfScalar<OtherNumber>::type>
+template <int dim, typename Number, typename OtherNumber>
 inline
-Tensor<0,dim,typename ProductType<Number, OtherNumber>::type>
+Tensor<0,dim,typename ProductType<Number, typename EnableIfScalar<OtherNumber>::type>::type>
 operator / (const Tensor<0,dim,Number> &t,
             const OtherNumber           factor)
 {