boost/ublas
2
0
Fork 0
mirror of https://github.com/boostorg/ublas.git synced 2026-02-13 12:52:14 +00:00
Code Issues Projects Releases Wiki Activity

fixed miss () on some std::min

Browse Source 
svn path=/trunk/boost/boost/numeric/ublas/; revision=23533
This commit is contained in:
Michael Stevens
2004-07-14 09:26:24 +00:00
parent a01d2a9899
commit ae2281f4e9
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/numeric/ublas/matrix.hpp
View File

@@ -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];

2
include/boost/numeric/ublas/traits.hpp
View File

@@ -1426,7 +1426,7 @@ namespace boost { namespace numeric { namespace ublas {
template<class I>
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<class I>
BOOST_UBLAS_INLINE

2
include/boost/numeric/ublas/vector.hpp
View File

@@ -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;
}