feedc0de/boost_core
1
0
Fork 0
forked from boostorg/core
Code Pull Requests Activity

Enclose std::min in parentheses to guard against <windows.h>

Browse Source
This commit is contained in:
Peter Dimov
2021-12-20 01:35:55 +02:00
parent 392cc988dd
commit df3b9827cf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/core/detail/string_view.hpp
View File

@ -555,7 +555,7 @@ public:
boost::throw_exception( std::out_of_range( "basic_string_view::copy" ), BOOST_CURRENT_LOCATION ); boost::throw_exception( std::out_of_range( "basic_string_view::copy" ), BOOST_CURRENT_LOCATION );
} }
std::size_t rlen = std::min( n, size() - pos ); std::size_t rlen = (std::min)( n, size() - pos );
traits_type::copy( s, data() + pos, rlen ); traits_type::copy( s, data() + pos, rlen );
@ -569,7 +569,7 @@ public:
boost::throw_exception( std::out_of_range( "basic_string_view::substr" ), BOOST_CURRENT_LOCATION ); boost::throw_exception( std::out_of_range( "basic_string_view::substr" ), BOOST_CURRENT_LOCATION );
} }
std::size_t rlen = std::min( n, size() - pos ); std::size_t rlen = (std::min)( n, size() - pos );
return basic_string_view( data() + pos, rlen ); return basic_string_view( data() + pos, rlen );
} }
@ -578,7 +578,7 @@ public:
BOOST_CXX14_CONSTEXPR int compare( basic_string_view str ) const BOOST_NOEXCEPT BOOST_CXX14_CONSTEXPR int compare( basic_string_view str ) const BOOST_NOEXCEPT
{ {
std::size_t rlen = std::min( size(), str.size() ); std::size_t rlen = (std::min)( size(), str.size() );
int cmp = traits_type::compare( data(), str.data(), rlen ); int cmp = traits_type::compare( data(), str.data(), rlen );