]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Bugfix: Avoid C++11 only syntax
authorMatthias Maier <tamiko@43-1.org>
Mon, 7 Sep 2015 04:42:48 +0000 (23:42 -0500)
committerMatthias Maier <tamiko@43-1.org>
Mon, 7 Sep 2015 18:36:24 +0000 (13:36 -0500)
include/deal.II/base/tensor.h

index 28100f3110fa3f53c6532ed96896190baca6a5b4..7a52daf46f59a419b6e313544abf878919d27cf6 100644 (file)
@@ -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)
 {

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.