Fixed compilation warning triggered by gcc 4.7

This commit is contained in:
Benoit Steiner 2015-04-18 13:41:06 -07:00
parent 9c6b82bcd5
commit 3b429b71e6

View File

@ -507,7 +507,7 @@ struct TensorContractionEvaluatorBase
internal::array_size<typename TensorEvaluator<EvalLeftArgType, Device>::Dimensions>::value; internal::array_size<typename TensorEvaluator<EvalLeftArgType, Device>::Dimensions>::value;
static const int RDims = static const int RDims =
internal::array_size<typename TensorEvaluator<EvalRightArgType, Device>::Dimensions>::value; internal::array_size<typename TensorEvaluator<EvalRightArgType, Device>::Dimensions>::value;
static const int ContractDims = internal::array_size<Indices>::value; static const unsigned int ContractDims = internal::array_size<Indices>::value;
static const int NumDims = internal::max_n_1<LDims + RDims - 2 * ContractDims>::size; static const int NumDims = internal::max_n_1<LDims + RDims - 2 * ContractDims>::size;
typedef array<Index, LDims> left_dim_mapper_t; typedef array<Index, LDims> left_dim_mapper_t;
@ -545,7 +545,7 @@ struct TensorContractionEvaluatorBase
eval_right_dims[i] = m_rightImpl.dimensions()[i]; eval_right_dims[i] = m_rightImpl.dimensions()[i];
} }
// We keep the pairs of contracting indices. // We keep the pairs of contracting indices.
for (int i = 0; i < ContractDims; i++) { for (unsigned int i = 0; i < ContractDims; i++) {
eval_op_indices[i].first = op.indices()[i].first; eval_op_indices[i].first = op.indices()[i].first;
eval_op_indices[i].second = op.indices()[i].second; eval_op_indices[i].second = op.indices()[i].second;
} }
@ -559,7 +559,7 @@ struct TensorContractionEvaluatorBase
} }
// We need to flip all the pairs of contracting indices as well as // We need to flip all the pairs of contracting indices as well as
// reversing the dimensions. // reversing the dimensions.
for (int i = 0; i < ContractDims; i++) { for (unsigned int i = 0; i < ContractDims; i++) {
eval_op_indices[i].first = LDims - 1 - op.indices()[i].second; eval_op_indices[i].first = LDims - 1 - op.indices()[i].second;
eval_op_indices[i].second = RDims - 1 - op.indices()[i].first; eval_op_indices[i].second = RDims - 1 - op.indices()[i].first;
} }
@ -596,7 +596,7 @@ struct TensorContractionEvaluatorBase
for (int i = 0; i < LDims; i++) { for (int i = 0; i < LDims; i++) {
// find if we are contracting on index i of left tensor // find if we are contracting on index i of left tensor
bool contracting = false; bool contracting = false;
for (int j = 0; j < ContractDims; j++) { for (unsigned int j = 0; j < ContractDims; j++) {
if (eval_op_indices[j].first == i) { if (eval_op_indices[j].first == i) {
contracting = true; contracting = true;
break; break;
@ -624,7 +624,7 @@ struct TensorContractionEvaluatorBase
for (int i = 0; i < RDims; i++) { for (int i = 0; i < RDims; i++) {
bool contracting = false; bool contracting = false;
// find if we are contracting on index i of right tensor // find if we are contracting on index i of right tensor
for (int j = 0; j < ContractDims; j++) { for (unsigned int j = 0; j < ContractDims; j++) {
if (eval_op_indices[j].second == i) { if (eval_op_indices[j].second == i) {
contracting = true; contracting = true;
break; break;