[Boost-commit] svn:boost r81911 - trunk/boost/algorithm

Subject: [Boost-commit] svn:boost r81911 - trunk/boost/algorithm
From: marshall_at_[hidden]
Date: 2012-12-13 14:51:25

Author: marshall
Date: 2012-12-13 14:51:24 EST (Thu, 13 Dec 2012)
New Revision: 81911
URL: http://svn.boost.org/trac/boost/changeset/81911

Log:
Fixed usage of std::min to match boost guidelines
Text files modified: 
   trunk/boost/algorithm/string_ref.hpp |     4 ++--                                    
   1 files changed, 2 insertions(+), 2 deletions(-)

Modified: trunk/boost/algorithm/string_ref.hpp
==============================================================================
--- trunk/boost/algorithm/string_ref.hpp	(original)
+++ trunk/boost/algorithm/string_ref.hpp	2012-12-13 14:51:24 EST (Thu, 13 Dec 2012)
@@ -158,7 +158,7 @@
             }
         
         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 @@
 }
 #endif
 
-#endif
\ No newline at end of file
+#endif