Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: un-qualify Range::value_type for compatibility with fmt v11 #2265

Closed
wants to merge 1 commit into from
+16 −20
Closed

fix: un-qualify Range::value_type for compatibility with fmt v11 #2265

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 16 additions & 20 deletions folly/Range.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ inline size_t qfind(
*/
template <class Iter>
size_t qfind(
const Range<Iter>& haystack,
const typename Range<Iter>::value_type& needle);
const Range<Iter>& haystack, typename Range<Iter>::const_reference needle);

/**
* Finds the last occurrence of needle in haystack. The result is the
Expand All @@ -114,8 +113,7 @@ size_t qfind(
*/
template <class Iter>
size_t rfind(
const Range<Iter>& haystack,
const typename Range<Iter>::value_type& needle);
const Range<Iter>& haystack, typename Range<Iter>::const_reference needle);

/**
* Finds the first occurrence of any element of needle in
Expand Down Expand Up @@ -247,10 +245,10 @@ class Range {
using size_type = std::size_t;
using iterator = Iter;
using const_iterator = Iter;
using value_type = typename std::remove_reference<
typename std::iterator_traits<Iter>::reference>::type;
using difference_type = typename std::iterator_traits<Iter>::difference_type;
using reference = typename std::iterator_traits<Iter>::reference;
using const_reference = std::add_const_t<reference>;
using value_type = std::remove_cv_t<std::remove_reference_t<reference>>;
using difference_type = typename std::iterator_traits<Iter>::difference_type;

/*
* For MutableStringPiece and MutableByteRange we define StringPiece
Expand Down Expand Up @@ -592,19 +590,19 @@ class Range {
constexpr Iter end() const { return e_; }
constexpr Iter cbegin() const { return b_; }
constexpr Iter cend() const { return e_; }
value_type& front() {
reference front() {
assert(b_ < e_);
return *b_;
}
value_type& back() {
reference back() {
assert(b_ < e_);
return *std::prev(e_);
}
const value_type& front() const {
const_reference front() const {
assert(b_ < e_);
return *b_;
}
const value_type& back() const {
const_reference back() const {
assert(b_ < e_);
return *std::prev(e_);
}
Expand Down Expand Up @@ -745,24 +743,24 @@ class Range {
return r;
}

value_type& operator[](size_t i) {
reference operator[](size_t i) {
assert(i < size());
return b_[i];
}

const value_type& operator[](size_t i) const {
const_reference operator[](size_t i) const {
assert(i < size());
return b_[i];
}

value_type& at(size_t i) {
reference at(size_t i) {
if (i >= size()) {
throw_exception<std::out_of_range>("index out of range");
}
return b_[i];
}

const value_type& at(size_t i) const {
const_reference at(size_t i) const {
if (i >= size()) {
throw_exception<std::out_of_range>("index out of range");
}
Expand Down Expand Up @@ -948,7 +946,7 @@ class Range {
return find(other) != std::string::npos;
}

bool contains(const value_type& other) const {
bool contains(const_reference other) const {
return find(other) != std::string::npos;
}

Expand Down Expand Up @@ -1560,16 +1558,14 @@ struct AsciiCaseInsensitive {

template <class Iter>
size_t qfind(
const Range<Iter>& haystack,
const typename Range<Iter>::value_type& needle) {
const Range<Iter>& haystack, typename Range<Iter>::const_reference needle) {
auto pos = std::find(haystack.begin(), haystack.end(), needle);
return pos == haystack.end() ? std::string::npos : pos - haystack.data();
}

template <class Iter>
size_t rfind(
const Range<Iter>& haystack,
const typename Range<Iter>::value_type& needle) {
const Range<Iter>& haystack, typename Range<Iter>::const_reference needle) {
for (auto i = haystack.size(); i-- > 0;) {
if (haystack[i] == needle) {
return i;
Expand Down
Loading