diff options
| author | Xing Ji <33065325+jixingcn@users.noreply.github.com> | 2021-07-23 06:31:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 15:31:44 -0700 |
| commit | eea00aaa919f720e2dfc8b86ebe1402a5c4679be (patch) | |
| tree | 3a3f018b26faff417ba19981e3cc8a7f1a7bb668 /ports/flatbuffers/fix-issue-6036.patch | |
| parent | 10c81db0c95f91acfc97e7f51f58c3834a1c9892 (diff) | |
| download | vcpkg-eea00aaa919f720e2dfc8b86ebe1402a5c4679be.tar.gz vcpkg-eea00aaa919f720e2dfc8b86ebe1402a5c4679be.zip | |
[flatbuffers] upgrade the `flatbuffers` to v2.0.0 (#18897)
* upgrade the flatbuffers's version
* run `vcpkg x-add-version`
* upgrade flatbuffers to v2.0.0 for mnn
* add new port-version of `mnn` after upgrade the flatbuffers
* fix the port-version of `mnn`
* Update ports/mnn/vcpkg.json
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Update ports/flatbuffers/CONTROL
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* run `vcpkg x-add-version flatbuffers --overwrite-version`
* run `vcpkg x-add-version mnn --overwrite-version`
* regenerate code files by flatc before build
* run `vcpkg x-add-version mnn --overwrite-version`
* add `flatbuffers` in dependencies
* run `vcpkg x-add-version mnn --overwrite-version`
* new port version for mnn
* run `vcpkg x-add-version mnn --overwrite-version` to rebuild
* Update versions/m-/mnn.json
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Update ports/mnn/vcpkg.json
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* run `vcpkg x-add-version mnn --overwrite-version`
* Add missing quotes.
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
Diffstat (limited to 'ports/flatbuffers/fix-issue-6036.patch')
| -rw-r--r-- | ports/flatbuffers/fix-issue-6036.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/ports/flatbuffers/fix-issue-6036.patch b/ports/flatbuffers/fix-issue-6036.patch deleted file mode 100644 index 872b73e6f..000000000 --- a/ports/flatbuffers/fix-issue-6036.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h -index c4dc5bc..c090455 100644 ---- a/include/flatbuffers/flatbuffers.h -+++ b/include/flatbuffers/flatbuffers.h -@@ -1861,14 +1861,14 @@ class FlatBufferBuilder { - - /// @cond FLATBUFFERS_INTERNAL - template<typename T> struct TableKeyComparator { -- TableKeyComparator(vector_downward &buf) : buf_(buf) {} -+ TableKeyComparator(vector_downward &buf) : buf_(&buf) {} - TableKeyComparator(const TableKeyComparator &other) : buf_(other.buf_) {} - bool operator()(const Offset<T> &a, const Offset<T> &b) const { -- auto table_a = reinterpret_cast<T *>(buf_.data_at(a.o)); -- auto table_b = reinterpret_cast<T *>(buf_.data_at(b.o)); -+ auto table_a = reinterpret_cast<T *>(buf_->data_at(a.o)); -+ auto table_b = reinterpret_cast<T *>(buf_->data_at(b.o)); - return table_a->KeyCompareLessThan(table_b); - } -- vector_downward &buf_; -+ vector_downward *buf_; - - private: - TableKeyComparator &operator=(const TableKeyComparator &other) { |