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

Removed unneeded copies

Browse Source
This commit is contained in:
Krystian Stasiowski
2019-10-27 16:26:49 -04:00
parent b8695d8644
commit 9156aa8ec8
2 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
include/boost/fixed_string/fixed_string.hpp
View File

@ -1518,10 +1518,8 @@ public:
const T& t,
size_type pos = 0) const
{
return string_view_type(
*this).find(
t, pos);
string_view_type sv = t;
return find(sv.data(), pos, sv.size());
}
#endif
@ -1585,9 +1583,8 @@ public:
const T& t,
size_type pos = npos) const
{
return string_view_type(
*this).rfind(
t, pos);
string_view_type sv = t;
return rfind(sv.data(), pos, sv.size());
}
#endif
@ -1650,9 +1647,8 @@ public:
const T& t,
size_type pos = 0) const
{
return string_view_type(
*this).find_first_of(
t, pos);
string_view_type sv = t;
return find_first_of(sv.data(), pos, sv.size());
}
#endif
@ -1715,9 +1711,8 @@ public:
const T& t,
size_type pos = npos) const
{
return string_view_type(
*this).find_last_of(
t, pos);
string_view_type sv = t;
return find_last_of(sv.data(), pos, sv.size());
}
#endif
@ -1780,9 +1775,8 @@ public:
const T& t,
size_type pos = 0) const
{
return string_view_type(
*this).find_first_not_of(
t, pos);
string_view_type sv = t;
return find_first_not_of(sv.data(), pos, sv.size());
}
#endif
@ -1845,9 +1839,8 @@ public:
const T& t,
size_type pos = npos) const
{
return string_view_type(
*this).find_last_not_of(
t, pos);
string_view_type sv = t;
return find_last_not_of(sv.data(), pos, sv.size());
}
#endif

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

@ -667,12 +667,10 @@ find(
size_type n) const ->
size_type
{
if (pos > n_)
if (pos > n_ || n > n_ - pos)
return npos;
if (!n)
return pos;
if (n > n_ - pos)
return npos;
const auto res = std::search(&s_[pos], &s_[n_], s, &s[n], Traits::eq);
return res == end() ? npos : std::distance(s_, res);
}