feedc0de/boost_static_string
1
0
Fork 0
forked from boostorg/static_string
Code Pull Requests Activity

Protected std::min/max calls

Browse Source
This commit is contained in:
Krystian Stasiowski
2019-10-30 14:05:52 -04:00
parent 0f2ac40d48
commit 7a8a158857
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/fixed_string/detail/fixed_string.hpp
View File

@ -11,7 +11,6 @@
#define BOOST_FIXED_STRING_DETAIL_FIXED_STRING_HPP #define BOOST_FIXED_STRING_DETAIL_FIXED_STRING_HPP
#include <boost/fixed_string/config.hpp> #include <boost/fixed_string/config.hpp>
#include <boost/core/ignore_unused.hpp>
#include <iterator> #include <iterator>
#include <type_traits> #include <type_traits>
@ -151,7 +150,6 @@ inline
CharT* CharT*
raw_to_string(CharT* last, std::size_t size, Integer i) raw_to_string(CharT* last, std::size_t size, Integer i)
{ {
boost::ignore_unused(size);
BOOST_FIXED_STRING_ASSERT(size >= max_digits(sizeof(Integer))); BOOST_FIXED_STRING_ASSERT(size >= max_digits(sizeof(Integer)));
return raw_to_string<CharT, Integer, Traits>( return raw_to_string<CharT, Integer, Traits>(
last, i, std::is_signed<Integer>{}); last, i, std::is_signed<Integer>{});

4
include/boost/fixed_string/impl/fixed_string.hpp
View File

@ -589,7 +589,7 @@ replace(
if (pos > size()) if (pos > size())
BOOST_FIXED_STRING_THROW(std::out_of_range{ BOOST_FIXED_STRING_THROW(std::out_of_range{
"pos > size()"}); "pos > size()"});
if (size() - std::min(n1, size() - pos) >= max_size() - n2) if (size() - (std::min)(n1, size() - pos) >= max_size() - n2)
BOOST_FIXED_STRING_THROW(std::length_error{ BOOST_FIXED_STRING_THROW(std::length_error{
"replaced string exceeds max_size()"}); "replaced string exceeds max_size()"});
if (pos + n1 >= size()) if (pos + n1 >= size())
@ -638,7 +638,7 @@ replace(
if (pos > size()) if (pos > size())
BOOST_FIXED_STRING_THROW(std::out_of_range{ BOOST_FIXED_STRING_THROW(std::out_of_range{
"pos > size()"}); "pos > size()"});
if (size() - std::min(n1, size() - pos) >= max_size() - n2) if (size() - (std::min)(n1, size() - pos) >= max_size() - n2)
BOOST_FIXED_STRING_THROW(std::length_error{ BOOST_FIXED_STRING_THROW(std::length_error{
"replaced string exceeds max_size()"}); "replaced string exceeds max_size()"});
if (pos + n1 >= size()) if (pos + n1 >= size())