summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch')
-rw-r--r--meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch65
1 files changed, 0 insertions, 65 deletions
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch b/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch
deleted file mode 100644
index cd837d8de..000000000
--- a/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1From 787d5052a6034cc722b073c652cc610ae037f933 Mon Sep 17 00:00:00 2001
2From: Levi Tamasi <ltamasi@fb.com>
3Date: Fri, 22 Nov 2019 18:12:35 -0800
4Subject: [PATCH 1/2] Fix the constness issues around
5 autovector::iterator_impl's dereference operators (#6057)
6
7Summary:
8As described in detail in issue https://github.com/facebook/rocksdb/issues/6048, iterators' dereference operators
9(`*`, `->`, and `[]`) should return `pointer`s/`reference`s (as opposed to
10`const_pointer`s/`const_reference`s) even if the iterator itself is `const`
11to be in sync with the standard's iterator concept.
12Pull Request resolved: https://github.com/facebook/rocksdb/pull/6057
13
14Test Plan: make check
15
16Differential Revision: D18623235
17
18Pulled By: ltamasi
19
20fbshipit-source-id: 04e82d73bc0c67fb0ded018383af8dfc332050cc
21---
22Upstream-Status: Pending
23
24 thirdparty/rocksdb/util/autovector.h | 15 ++++-----------
25 1 file changed, 4 insertions(+), 11 deletions(-)
26
27diff --git a/thirdparty/rocksdb/util/autovector.h b/thirdparty/rocksdb/util/autovector.h
28index b5c84712..6d337908 100644
29--- a/thirdparty/rocksdb/util/autovector.h
30+++ b/thirdparty/rocksdb/util/autovector.h
31@@ -120,27 +120,20 @@ class autovector {
32 }
33
34 // -- Reference
35- reference operator*() {
36+ reference operator*() const {
37 assert(vect_->size() >= index_);
38 return (*vect_)[index_];
39 }
40
41- const_reference operator*() const {
42- assert(vect_->size() >= index_);
43- return (*vect_)[index_];
44- }
45-
46- pointer operator->() {
47+ pointer operator->() const {
48 assert(vect_->size() >= index_);
49 return &(*vect_)[index_];
50 }
51
52- const_pointer operator->() const {
53- assert(vect_->size() >= index_);
54- return &(*vect_)[index_];
55+ reference operator[](difference_type len) const {
56+ return *(*this + len);
57 }
58
59-
60 // -- Logical Operators
61 bool operator==(const self_type& other) const {
62 assert(vect_ == other.vect_);
63--
642.41.0
65