diff --git a/include/boost/numeric/ublas/matrix.hpp b/include/boost/numeric/ublas/matrix.hpp index f3482ce5..e2155c3a 100644 --- a/include/boost/numeric/ublas/matrix.hpp +++ b/include/boost/numeric/ublas/matrix.hpp @@ -114,8 +114,8 @@ namespace boost { namespace numeric { namespace ublas { if (preserve) { self_type temporary (size1, size2); // Common elements to preserve - const size_t size1_min = std::min (size1, size1_); - const size_t size2_min = std::min (size2, size2_); + const size_t size1_min = (std::min) (size1, size1_); + const size_t size2_min = (std::min) (size2, size2_); // Order loop for i-major and j-minor sizes const size_t i_size = functor_type::size1 (size1_min, size2_min); const size_t j_size = functor_type::size2 (size1_min, size2_min); @@ -3375,8 +3375,8 @@ namespace boost { namespace numeric { namespace ublas { if (preserve) { self_type temporary (size1, size2); // Common elements to preserve - const size_t size1_min = std::min (size1, size1_); - const size_t size2_min = std::min (size2, size2_); + const size_t size1_min = (std::min) (size1, size1_); + const size_t size2_min = (std::min) (size2, size2_); for (size_t i = 0; i != size1_min; ++i) { // indexing copy over major for (size_t j = 0; j != size1_min; ++j) { temporary.data_[i][j] = data_[i][j]; diff --git a/include/boost/numeric/ublas/traits.hpp b/include/boost/numeric/ublas/traits.hpp index 70ad3975..95cff8c9 100644 --- a/include/boost/numeric/ublas/traits.hpp +++ b/include/boost/numeric/ublas/traits.hpp @@ -1426,7 +1426,7 @@ namespace boost { namespace numeric { namespace ublas { template BOOST_UBLAS_INLINE void increment (I &it, const I &it_end, std::ptrdiff_t compare, packed_random_access_iterator_tag) { - it += std::min (compare, it_end - it); + it += (std::min) (compare, it_end - it); } template BOOST_UBLAS_INLINE diff --git a/include/boost/numeric/ublas/vector.hpp b/include/boost/numeric/ublas/vector.hpp index e257cc23..f453a2f1 100644 --- a/include/boost/numeric/ublas/vector.hpp +++ b/include/boost/numeric/ublas/vector.hpp @@ -1321,7 +1321,7 @@ namespace boost { namespace numeric { namespace ublas { void resize (size_type size, bool preserve = true) { if (size > N) bad_size ().raise (); - std::fill (data_ + std::min (size, size_), data_ + size, value_type ()); + std::fill (data_ + (std::min) (size, size_), data_ + size, value_type ()); size_ = size; }