Skip to content

[baseline][flatbuffers] backport fixes for Abseil and C++11 #29974

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

Merged
dan-shaw merged 3 commits into from
Mar 6, 2023
Merged

[baseline][flatbuffers] backport fixes for Abseil and C++11 #29974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
805e213
[flatbuffers] backport fixes for Abseil and C++11
coryan Mar 2, 2023
53e1b4e
Rebase and resolve conflicts
coryan Mar 2, 2023
6fc4d00
Address review comments
coryan Mar 3, 2023
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
13 changes: 13 additions & 0 deletions ports/flatbuffers/fix-abseil-cxx14.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h
Copy link
Contributor

@JackBoosY JackBoosY Mar 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was merged in the upstream PR google/flatbuffers#7824.

index 86688cc6e40..219b6d308ac 100644
--- a/include/flatbuffers/base.h
+++ b/include/flatbuffers/base.h
@@ -233,7 +233,7 @@ namespace flatbuffers {
}
#define FLATBUFFERS_HAS_STRING_VIEW 1
// Check for absl::string_view
- #elif __has_include("absl/strings/string_view.h")
+ #elif __has_include("absl/strings/string_view.h") && (__cplusplus >= 201411)
#include "absl/strings/string_view.h"
namespace flatbuffers {
typedef absl::string_view string_view;
1 change: 1 addition & 0 deletions ports/flatbuffers/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
fix-uwp-build.patch
fix-abseil-cxx14.patch
)

set(options "")
Expand Down
2 changes: 1 addition & 1 deletion ports/flatbuffers/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "flatbuffers",
"version": "23.1.21",
"port-version": 1,
"port-version": 2,
"description": [
"Memory Efficient Serialization Library",
"FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility."
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2454,7 +2454,7 @@
},
"flatbuffers": {
"baseline": "23.1.21",
"port-version": 1
"port-version": 2
},
"flecs": {
"baseline": "3.1.4",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/flatbuffers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8079babd92cd3c1a80b224beb8f034b1a912a8b6",
"version": "23.1.21",
"port-version": 2
},
{
"git-tree": "c8dd8a45a079d9ec27da5352d1d61eb24ff94f5d",
"version": "23.1.21",
Expand Down