diff options
| author |  Eugene Zhulenev <ezhulenev@google.com> | 2018-08-08 16:57:58 -0700 |
|---|---|---|
| committer | Eugene Zhulenev <ezhulenev@google.com> | 2018-08-08 16:57:58 -0700 |
| commit | 1c8b9e10a791cb43b4f730dcb5d7889099cc1c68 (patch) | |
| tree | a62a2f74c6e2bec8367a01272743260ec7f54cef /unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h | |
| parent | 1b0373ae10687ecc51ad9a0bfd46aa4ee116ade1 (diff) | |
| parent | 131ed1191fa5ccbe0265fcfccfc685642c388192 (diff) | |
Merged with upstream eigen
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h b/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h index 1db8d6124..877603421 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h @@ -89,7 +89,7 @@ EIGEN_STRONG_INLINE void MergeResourceRequirements( // policy if block shapes/sizes conflict). *block_shape = resources[0].block_shape; *block_total_size = resources[0].block_total_size; - for (int i = 1; i < resources.size(); ++i) { + for (std::vector<TensorOpResourceRequirements>::size_type i = 1; i < resources.size(); ++i) { if (resources[i].block_shape == TensorBlockShapeType::kSkewedInnerDims && *block_shape != TensorBlockShapeType::kSkewedInnerDims) { *block_shape = TensorBlockShapeType::kSkewedInnerDims; |