[mlpack-git] master: Cast to fix std::min() call. (995e0c0)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Mon Nov 30 10:46:02 EST 2015


Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/e4519fc42a2a340cf0387ab082bf49b9715c871b...995e0c0c2f41e45c4d34a54df4bdd743bc920f85

>---------------------------------------------------------------

commit 995e0c0c2f41e45c4d34a54df4bdd743bc920f85
Author: Ryan Curtin <ryan at ratml.org>
Date:   Mon Nov 30 07:41:03 2015 -0800

    Cast to fix std::min() call.


>---------------------------------------------------------------

995e0c0c2f41e45c4d34a54df4bdd743bc920f85
 src/mlpack/core/math/columns_to_blocks.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mlpack/core/math/columns_to_blocks.cpp b/src/mlpack/core/math/columns_to_blocks.cpp
index fa5e0bb..1a91e94 100644
--- a/src/mlpack/core/math/columns_to_blocks.cpp
+++ b/src/mlpack/core/math/columns_to_blocks.cpp
@@ -55,7 +55,7 @@ void ColumnsToBlocks::Transform(const arma::mat &maximalInputs, arma::mat &outpu
   output *= bufValue;
 
   size_t k = 0;
-  const size_t maxSize = std::min(rows * cols, maximalInputs.n_cols);
+  const size_t maxSize = std::min(rows * cols, (size_t) maximalInputs.n_cols);
   for(size_t i = 0; i != rows; ++i)
   {
     for(size_t j = 0; j != cols; ++j)



More information about the mlpack-git mailing list