Parallelizer: qualify std::min<int>() to avoid test/main.h macro collision libeigen/eigen!2483 Co-authored-by: Rasmus Munk Larsen <rmlarsen@gmail.com>
diff --git a/Eigen/src/Core/products/Parallelizer.h b/Eigen/src/Core/products/Parallelizer.h index f4625e2..96cc237 100644 --- a/Eigen/src/Core/products/Parallelizer.h +++ b/Eigen/src/Core/products/Parallelizer.h
@@ -141,7 +141,7 @@ // for OpenMP. eigen_internal_assert(*v >= 0); int omp_threads = omp_get_max_threads(); - m_maxThreads = (*v == 0 ? omp_threads : std::min(*v, omp_threads)); + m_maxThreads = (*v == 0 ? omp_threads : std::min<int>(*v, omp_threads)); #elif defined(EIGEN_GEMM_THREADPOOL) // Calling action == SetAction and *v = 0 means // restoring m_maxThreads to the number of threads in the ThreadPool,