From 20c9bad06d143986a2be30a748c96f223805fc6c Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Thu, 13 Dec 2012 19:51:24 +0000 Subject: [PATCH] Fixed usage of std::min to match boost guidelines [SVN r81911] --- include/boost/algorithm/string_ref.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/algorithm/string_ref.hpp b/include/boost/algorithm/string_ref.hpp index 843d160..ff1a5f8 100644 --- a/include/boost/algorithm/string_ref.hpp +++ b/include/boost/algorithm/string_ref.hpp @@ -158,7 +158,7 @@ namespace boost { } 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 ); } @@ -386,4 +386,4 @@ namespace std { } #endif -#endif \ No newline at end of file +#endif