From a7b7f3ca8a25bfef4058d8a212cdc504bf5aa50e Mon Sep 17 00:00:00 2001 From: Eugene Zhulenev Date: Tue, 23 Apr 2019 17:23:19 -0700 Subject: Add missing EIGEN_DEPRECATED annotations to deprecated functions and fix few other doxygen warnings --- unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h') diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h b/unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h index 7f79ac30d..195267ce8 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h @@ -177,7 +177,8 @@ class TensorCostModel { double threads = (cost - kStartupCycles) / kPerThreadCycles + 0.9; // Make sure we don't invoke undefined behavior when we convert to an int. threads = numext::mini(threads, GenericNumTraits::highest()); - return numext::mini(max_threads, numext::maxi(1, threads)); + return numext::mini(max_threads, + numext::maxi(1, static_cast(threads))); } // taskSize assesses parallel task size. -- cgit v1.2.3