From 124511c2e87e74f2f4a23140943c7bfdd66ca9de Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 2 Sep 2015 19:07:08 -0500 Subject: [PATCH] run astyle --- include/deal.II/base/tensor.h | 18 +++++++-------- include/deal.II/base/tensor_base.h | 34 ++++++++++++++-------------- tests/base/tensor_mixing_types_01.cc | 12 +++++----- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h index 738be73325..adf1df91e7 100644 --- a/include/deal.II/base/tensor.h +++ b/include/deal.II/base/tensor.h @@ -128,9 +128,9 @@ std::ostream &operator << (std::ostream &out, const Tensor<1,1,double> &p) * @relates EnableIfScalar */ template ::type> + typename Number, + typename OtherNumber, + typename = typename EnableIfScalar::type> inline Tensor<0,dim,typename ProductType::type> operator * (const OtherNumber factor, @@ -147,9 +147,9 @@ operator * (const OtherNumber factor, * @relates EnableIfScalar */ template ::type> + typename Number, + typename OtherNumber, + typename = typename EnableIfScalar::type> inline Tensor<0,dim,typename ProductType::type> operator * (const Tensor<0,dim,Number> &t, @@ -166,9 +166,9 @@ operator * (const Tensor<0,dim,Number> &t, * @relates EnableIfScalar */ template ::type> + typename Number, + typename OtherNumber, + typename = typename EnableIfScalar::type> inline Tensor<0,dim,typename ProductType::type> operator / (const Tensor<0,dim,Number> &t, diff --git a/include/deal.II/base/tensor_base.h b/include/deal.II/base/tensor_base.h index 08a1d022dd..741b960096 100644 --- a/include/deal.II/base/tensor_base.h +++ b/include/deal.II/base/tensor_base.h @@ -366,7 +366,7 @@ public: * times the number of independent components of each sub-tensor. */ static const unsigned int - n_independent_components = Tensor::n_independent_components * dim; + n_independent_components = Tensor::n_independent_components *dim; /** * Declare a type that holds real-valued numbers with the same precision @@ -394,7 +394,7 @@ public: * type statically. */ typedef typename Tensor::array_type - array_type[(dim != 0) ? dim : 1]; + array_type[(dim != 0) ? dim : 1]; /** * Constructor. Initialize all entries to zero if @@ -436,12 +436,12 @@ public: /** * Read-Write access operator. */ - value_type & operator [] (const unsigned int i); + value_type &operator [] (const unsigned int i); /** * Read-only access operator. */ - const value_type & operator[](const unsigned int i) const; + const value_type &operator[](const unsigned int i) const; /** * Read access using TableIndices indices @@ -852,11 +852,11 @@ namespace internal // tensor[indices[0]][indices[1]]...[indices[rank_]] template static inline - Number & extract(Tensor &t, const TableIndices &indices) + Number &extract(Tensor &t, const TableIndices &indices) { Assert (indices[rank - rank_]::template extract( - t[indices[rank - rank_]], indices); + t[indices[rank - rank_]], indices); } }; @@ -864,7 +864,7 @@ namespace internal { template static inline - Number & extract(Tensor<1,dim,Number> &t, const TableIndices &indices) + Number &extract(Tensor<1,dim,Number> &t, const TableIndices &indices) { Assert (indices[rank - 1]::unroll_recursion (Vector &result, { for (unsigned int i=0; i >(values[i]). - unroll_recursion(result, index); + unroll_recursion(result, index); } @@ -1302,9 +1302,9 @@ struct ProductType,U> * @relates EnableIfScalar */ template ::type> + typename Number, + typename OtherNumber, + typename = typename EnableIfScalar::type> inline Tensor::type> operator * (const Tensor &t, @@ -1327,9 +1327,9 @@ operator * (const Tensor &t, * @relates EnableIfScalar */ template ::type> + typename Number, + typename OtherNumber, + typename = typename EnableIfScalar::type> inline Tensor::type> operator * (const Number factor, @@ -1349,9 +1349,9 @@ operator * (const Number factor, * @relates EnableIfScalar */ template ::type> + typename Number, + typename OtherNumber, + typename = typename EnableIfScalar::type> inline Tensor::type> operator / (const Tensor &t, diff --git a/tests/base/tensor_mixing_types_01.cc b/tests/base/tensor_mixing_types_01.cc index e82d6ffbaf..ba51874a79 100644 --- a/tests/base/tensor_mixing_types_01.cc +++ b/tests/base/tensor_mixing_types_01.cc @@ -31,11 +31,11 @@ int main () deallog << f + d << std::endl; deallog << f - d << std::endl; - deallog << f * d << std::endl; + deallog << f *d << std::endl; deallog << d + c << std::endl; deallog << d - c << std::endl; - deallog << d * c << std::endl; + deallog << d *c << std::endl; float f_scalar = 10.; deallog << (d * f_scalar) << std::endl; @@ -59,11 +59,11 @@ int main () deallog << f + d << std::endl; deallog << f - d << std::endl; - deallog << f * d << std::endl; + deallog << f *d << std::endl; deallog << d + c << std::endl; deallog << d - c << std::endl; - deallog << d * c << std::endl; + deallog << d *c << std::endl; float f_scalar = 10.; deallog << (d * f_scalar) << std::endl; @@ -87,11 +87,11 @@ int main () deallog << f + d << std::endl; deallog << f - d << std::endl; - deallog << f * d << std::endl; + deallog << f *d << std::endl; deallog << d + c << std::endl; deallog << d - c << std::endl; - deallog << d * c << std::endl; + deallog << d *c << std::endl; float f_scalar = 10.; deallog << (d * f_scalar) << std::endl; -- 2.39.5