[cig-commits] commit: Merge
Mercurial
hg at geodynamics.org
Thu Jun 7 13:17:50 PDT 2012
changeset: 16:446a04e56b40
tag: tip
parent: 14:939864aa9983
parent: 15:507b2ff61ba4
user: Walter Landry <wlandry at caltech.edu>
date: Thu Jun 07 13:17:36 2012 -0700
description:
Merge
diff -r 939864aa9983 -r 446a04e56b40 Tensor2/Tensor2_times_Tensor1.hpp
--- a/Tensor2/Tensor2_times_Tensor1.hpp Mon Jun 04 17:16:21 2012 -0700
+++ b/Tensor2/Tensor2_times_Tensor1.hpp Thu Jun 07 13:17:36 2012 -0700
@@ -49,12 +49,12 @@ class Tensor2_times_Tensor1_0
const Tensor1_Expr<B,U,Dim1,j> iterB;
template<int Current_Dim>
- typename promote<T,U>::V eval(const int N1, const Number<Current_Dim> &N) const
+ typename promote<T,U>::V eval(const int N1, const Number<Current_Dim> &) const
{
return iterA(Current_Dim-1,N1)*iterB(Current_Dim-1)
+ eval(N1,Number<Current_Dim-1>());
}
- typename promote<T,U>::V eval(const int N1, const Number<1> &N) const
+ typename promote<T,U>::V eval(const int N1, const Number<1> &) const
{
return iterA(0,N1)*iterB(0);
}
diff -r 939864aa9983 -r 446a04e56b40 Tensor2/Tensor2_value.hpp
--- a/Tensor2/Tensor2_value.hpp Mon Jun 04 17:16:21 2012 -0700
+++ b/Tensor2/Tensor2_value.hpp Thu Jun 07 13:17:36 2012 -0700
@@ -154,7 +154,7 @@ public:
template<char i, int Dim>
Tensor1_Expr<const Tensor2_numeral_0<const Tensor2
<T,Tensor_Dim0,Tensor_Dim1>,T>,T,Dim,i>
- operator()(const int N, const Index<i,Dim> index1) const
+ operator()(const int N, const Index<i,Dim> ) const
{
typedef const Tensor2_numeral_0<const Tensor2<T,Tensor_Dim0,Tensor_Dim1,layout>,T>
TensorExpr;
@@ -167,13 +167,13 @@ public:
operator() which gives a Tensor2_Expr<>. */
template<char i, int Dim>
- T operator()(const Index<i,Dim> index1, const Index<i,Dim> index2)
+ T operator()(const Index<i,Dim> , const Index<i,Dim> )
{
return internal_contract(Number<Dim>());
}
template<char i, int Dim>
- T operator()(const Index<i,Dim> index1, const Index<i,Dim> index2) const
+ T operator()(const Index<i,Dim> , const Index<i,Dim> ) const
{
return internal_contract(Number<Dim>());
}
More information about the CIG-COMMITS
mailing list