diff options
author | Gael Guennebaud <g.gael@free.fr> | 2011-07-21 11:19:36 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2011-07-21 11:19:36 +0200 |
commit | 22bff949c898e7c340a415d771145c0bd22317d6 (patch) | |
tree | be0fc956a220db15d4d7622fc580777f563ea643 /Eigen/src/Core/products/SelfadjointMatrixMatrix.h | |
parent | d4bd8bddb5e9f968ffcbdfff5936934e3d706684 (diff) |
protect calls to min and max with parentheses to make Eigen compatible with default windows.h
(transplanted from 49b6e9143e1d74441924c0c313536e263e12a55c
)
Diffstat (limited to 'Eigen/src/Core/products/SelfadjointMatrixMatrix.h')
-rw-r--r-- | Eigen/src/Core/products/SelfadjointMatrixMatrix.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Eigen/src/Core/products/SelfadjointMatrixMatrix.h b/Eigen/src/Core/products/SelfadjointMatrixMatrix.h index 6eb54d6ef..ccd757cfa 100644 --- a/Eigen/src/Core/products/SelfadjointMatrixMatrix.h +++ b/Eigen/src/Core/products/SelfadjointMatrixMatrix.h @@ -114,7 +114,7 @@ struct symm_pack_rhs } // second part: diagonal block - for(Index j2=k2; j2<std::min(k2+rows,packet_cols); j2+=nr) + for(Index j2=k2; j2<(std::min)(k2+rows,packet_cols); j2+=nr) { // again we can split vertically in three different parts (transpose, symmetric, normal) // transpose @@ -179,7 +179,7 @@ struct symm_pack_rhs for(Index j2=packet_cols; j2<cols; ++j2) { // transpose - Index half = std::min(end_k,j2); + Index half = (std::min)(end_k,j2); for(Index k=k2; k<half; k++) { blockB[count] = conj(rhs(j2,k)); @@ -261,7 +261,7 @@ struct product_selfadjoint_matrix<Scalar,Index,LhsStorageOrder,true,ConjugateLhs Index nc = cols; // cache block size along the N direction computeProductBlockingSizes<Scalar,Scalar>(kc, mc, nc); // kc must smaller than mc - kc = std::min(kc,mc); + kc = (std::min)(kc,mc); std::size_t sizeW = kc*Traits::WorkSpaceFactor; std::size_t sizeB = sizeW + kc*cols; @@ -276,7 +276,7 @@ struct product_selfadjoint_matrix<Scalar,Index,LhsStorageOrder,true,ConjugateLhs for(Index k2=0; k2<size; k2+=kc) { - const Index actual_kc = std::min(k2+kc,size)-k2; + const Index actual_kc = (std::min)(k2+kc,size)-k2; // we have selected one row panel of rhs and one column panel of lhs // pack rhs's panel into a sequential chunk of memory @@ -289,7 +289,7 @@ struct product_selfadjoint_matrix<Scalar,Index,LhsStorageOrder,true,ConjugateLhs // 3 - the panel below the diagonal block => generic packed copy for(Index i2=0; i2<k2; i2+=mc) { - const Index actual_mc = std::min(i2+mc,k2)-i2; + const Index actual_mc = (std::min)(i2+mc,k2)-i2; // transposed packed copy pack_lhs_transposed(blockA, &lhs(k2, i2), lhsStride, actual_kc, actual_mc); @@ -297,7 +297,7 @@ struct product_selfadjoint_matrix<Scalar,Index,LhsStorageOrder,true,ConjugateLhs } // the block diagonal { - const Index actual_mc = std::min(k2+kc,size)-k2; + const Index actual_mc = (std::min)(k2+kc,size)-k2; // symmetric packed copy pack_lhs(blockA, &lhs(k2,k2), lhsStride, actual_kc, actual_mc); @@ -306,7 +306,7 @@ struct product_selfadjoint_matrix<Scalar,Index,LhsStorageOrder,true,ConjugateLhs for(Index i2=k2+kc; i2<size; i2+=mc) { - const Index actual_mc = std::min(i2+mc,size)-i2; + const Index actual_mc = (std::min)(i2+mc,size)-i2; gemm_pack_lhs<Scalar, Index, Traits::mr, Traits::LhsProgress, LhsStorageOrder,false>() (blockA, &lhs(i2, k2), lhsStride, actual_kc, actual_mc); @@ -352,14 +352,14 @@ struct product_selfadjoint_matrix<Scalar,Index,LhsStorageOrder,false,ConjugateLh for(Index k2=0; k2<size; k2+=kc) { - const Index actual_kc = std::min(k2+kc,size)-k2; + const Index actual_kc = (std::min)(k2+kc,size)-k2; pack_rhs(blockB, _rhs, rhsStride, actual_kc, cols, k2); // => GEPP for(Index i2=0; i2<rows; i2+=mc) { - const Index actual_mc = std::min(i2+mc,rows)-i2; + const Index actual_mc = (std::min)(i2+mc,rows)-i2; pack_lhs(blockA, &lhs(i2, k2), lhsStride, actual_kc, actual_mc); gebp_kernel(res+i2, resStride, blockA, blockB, actual_mc, actual_kc, cols, alpha); |