feedc0de/boost_algorithm
1
0
Fork 0
forked from boostorg/algorithm
Code Pull Requests Activity

Fixed usage of std::min to match boost guidelines

Browse Source 
[SVN r81911]
This commit is contained in:
Marshall Clow
2012-12-13 19:51:24 +00:00
parent 06d0a61a01
commit 20c9bad06d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/algorithm/string_ref.hpp
View File

@ -158,7 +158,7 @@ namespace boost {
} }
int compare(basic_string_ref x) const { int compare(basic_string_ref x) const {
int cmp = traits::compare ( ptr_, x.ptr_, std::min(len_, x.len_)); int cmp = traits::compare ( ptr_, x.ptr_, (std::min)(len_, x.len_));
return cmp != 0 ? cmp : ( len_ == x.len_ ? 0 : len_ < x.len_ ? -1 : 1 ); return cmp != 0 ? cmp : ( len_ == x.len_ ? 0 : len_ < x.len_ ? -1 : 1 );
} }
@ -386,4 +386,4 @@ namespace std {
} }
#endif #endif
#endif #endif