diff --git a/doc/samples/banded_adaptor.cpp b/doc/samples/banded_adaptor.cpp index 61552021..9e66280f 100644 --- a/doc/samples/banded_adaptor.cpp +++ b/doc/samples/banded_adaptor.cpp @@ -22,7 +22,7 @@ int main () { matrix m (3, 3); banded_adaptor > ba (m, 1, 1); for (signed i = 0; i < signed (ba.size1 ()); ++ i) - for (signed j = std::max (i - 1, 0); j < std::min (i + 2, signed (ba.size2 ())); ++ j) + for (signed j = (std::max) (i - 1, 0); j < std::min (i + 2, signed (ba.size2 ())); ++ j) ba (i, j) = 3 * i + j; std::cout << ba << std::endl; } diff --git a/doc/samples/banded_matrix.cpp b/doc/samples/banded_matrix.cpp index 68ee4d39..fe7b23a4 100644 --- a/doc/samples/banded_matrix.cpp +++ b/doc/samples/banded_matrix.cpp @@ -21,7 +21,7 @@ int main () { using namespace boost::numeric::ublas; banded_matrix m (3, 3, 1, 1); for (signed i = 0; i < signed (m.size1 ()); ++ i) - for (signed j = std::max (i - 1, 0); j < std::min (i + 2, signed (m.size2 ())); ++ j) + for (signed j = (std::max) (i - 1, 0); j < std::min (i + 2, signed (m.size2 ())); ++ j) m (i, j) = 3 * i + j; std::cout << m << std::endl; } diff --git a/doc/samples/matrix_binary.cpp b/doc/samples/matrix_binary.cpp index e4f67bf1..33f8f505 100644 --- a/doc/samples/matrix_binary.cpp +++ b/doc/samples/matrix_binary.cpp @@ -20,8 +20,8 @@ int main () { using namespace boost::numeric::ublas; matrix m1 (3, 3), m2 (3, 3); - for (unsigned i = 0; i < std::min (m1.size1 (), m2.size1 ()); ++ i) - for (unsigned j = 0; j < std::min (m1.size2 (), m2.size2 ()); ++ j) + for (unsigned i = 0; i < (std::min) (m1.size1 (), m2.size1 ()); ++ i) + for (unsigned j = 0; j < (std::min) (m1.size2 (), m2.size2 ()); ++ j) m1 (i, j) = m2 (i, j) = 3 * i + j; std::cout << m1 + m2 << std::endl; diff --git a/doc/samples/matrix_matrix_binary.cpp b/doc/samples/matrix_matrix_binary.cpp index 45b58efc..659f1511 100644 --- a/doc/samples/matrix_matrix_binary.cpp +++ b/doc/samples/matrix_matrix_binary.cpp @@ -20,8 +20,8 @@ int main () { using namespace boost::numeric::ublas; matrix m1 (3, 3), m2 (3, 3); - for (unsigned i = 0; i < std::min (m1.size1 (), m2.size1 ()); ++ i) - for (unsigned j = 0; j < std::min (m1.size2 (), m2.size2 ()); ++ j) + for (unsigned i = 0; i < (std::min) (m1.size1 (), m2.size1 ()); ++ i) + for (unsigned j = 0; j < (std::min) (m1.size2 (), m2.size2 ()); ++ j) m1 (i, j) = m2 (i, j) = 3 * i + j; std::cout << prod (m1, m2) << std::endl; diff --git a/doc/samples/matrix_matrix_solve.cpp b/doc/samples/matrix_matrix_solve.cpp index 7b92c6d3..a659c299 100644 --- a/doc/samples/matrix_matrix_solve.cpp +++ b/doc/samples/matrix_matrix_solve.cpp @@ -20,7 +20,7 @@ int main () { using namespace boost::numeric::ublas; matrix m1 (3, 3), m2 (3, 3); - for (unsigned i = 0; i < std::min (m1.size1 (), m2.size1 ()); ++ i) + for (unsigned i = 0; i < (std::min) (m1.size1 (), m2.size1 ()); ++ i) for (unsigned j = 0; j <= i; ++ j) m1 (i, j) = m2 (i, j) = 3 * i + j + 1; diff --git a/doc/samples/matrix_vector_binary.cpp b/doc/samples/matrix_vector_binary.cpp index 39e4edf6..4112b762 100644 --- a/doc/samples/matrix_vector_binary.cpp +++ b/doc/samples/matrix_vector_binary.cpp @@ -21,7 +21,7 @@ int main () { using namespace boost::numeric::ublas; matrix m (3, 3); vector v (3); - for (unsigned i = 0; i < std::min (m.size1 (), v.size ()); ++ i) { + for (unsigned i = 0; i < (std::min) (m.size1 (), v.size ()); ++ i) { for (unsigned j = 0; j < m.size2 (); ++ j) m (i, j) = 3 * i + j; v (i) = i; diff --git a/doc/samples/matrix_vector_solve.cpp b/doc/samples/matrix_vector_solve.cpp index 1f432482..bbd48b07 100644 --- a/doc/samples/matrix_vector_solve.cpp +++ b/doc/samples/matrix_vector_solve.cpp @@ -21,7 +21,7 @@ int main () { using namespace boost::numeric::ublas; matrix m (3, 3); vector v (3); - for (unsigned i = 0; i < std::min (m.size1 (), v.size ()); ++ i) { + for (unsigned i = 0; i < (std::min) (m.size1 (), v.size ()); ++ i) { for (unsigned j = 0; j <= i; ++ j) m (i, j) = 3 * i + j + 1; v (i) = i; diff --git a/doc/samples/vector_binary.cpp b/doc/samples/vector_binary.cpp index d664c1d4..70a8adba 100644 --- a/doc/samples/vector_binary.cpp +++ b/doc/samples/vector_binary.cpp @@ -20,7 +20,7 @@ int main () { using namespace boost::numeric::ublas; vector v1 (3), v2 (3); - for (unsigned i = 0; i < std::min (v1.size (), v2.size ()); ++ i) + for (unsigned i = 0; i < (std::min) (v1.size (), v2.size ()); ++ i) v1 (i) = v2 (i) = i; std::cout << v1 + v2 << std::endl; diff --git a/doc/samples/vector_binary_outer.cpp b/doc/samples/vector_binary_outer.cpp index 42fa2569..b77246d2 100644 --- a/doc/samples/vector_binary_outer.cpp +++ b/doc/samples/vector_binary_outer.cpp @@ -20,7 +20,7 @@ int main () { using namespace boost::numeric::ublas; vector v1 (3), v2 (3); - for (unsigned i = 0; i < std::min (v1.size (), v2.size ()); ++ i) + for (unsigned i = 0; i < (std::min) (v1.size (), v2.size ()); ++ i) v1 (i) = v2 (i) = i; std::cout << outer_prod (v1, v2) << std::endl; diff --git a/doc/samples/vector_binary_redux.cpp b/doc/samples/vector_binary_redux.cpp index 754c6154..278dbd4c 100644 --- a/doc/samples/vector_binary_redux.cpp +++ b/doc/samples/vector_binary_redux.cpp @@ -19,7 +19,7 @@ int main () { using namespace boost::numeric::ublas; vector v1 (3), v2 (3); - for (unsigned i = 0; i < std::min (v1.size (), v2.size ()); ++ i) + for (unsigned i = 0; i < (std::min) (v1.size (), v2.size ()); ++ i) v1 (i) = v2 (i) = i; std::cout << inner_prod (v1, v2) << std::endl;