boostorg/utility
1
0
Fork 1
mirror of https://github.com/boostorg/utility.git synced 2025-10-16 18:35:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in string_ref::find; Refs #8067

Browse Source 
[SVN r82901]
This commit is contained in:
Marshall Clow
2013-02-15 16:07:06 +00:00
parent 05af0deaed
commit e4d622019f
2 changed files with 77 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/utility/string_ref.hpp
View File

@@ -155,7 +155,7 @@ namespace boost {
}
int compare(basic_string_ref x) const {
int cmp = traits::compare ( ptr_, x.ptr_, (std::min)(len_, x.len_));
const 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 );
}
@@ -172,7 +172,7 @@ namespace boost {
size_type find(basic_string_ref s) const {
const_iterator iter = std::search ( this->cbegin (), this->cend (),
s.cbegin (), s.cend (), traits::eq );
return iter = this->cend () ? npos : std::distance ( this->cbegin (), iter );
return iter == this->cend () ? npos : std::distance ( this->cbegin (), iter );
}
size_type find(charT c) const {
@@ -198,7 +198,7 @@ namespace boost {
size_type find_first_of(basic_string_ref s) const {
const_iterator iter = std::find_first_of
( this->cbegin (), this->cend (), s.cbegin (), s.cend (), traits::eq );
( this->cbegin (), this->cend (), s.cbegin (), s.cend (), traits::eq );
return iter == this->cend () ? npos : std::distance ( this->cbegin (), iter );
}