diff --git a/cpp/thirdparty/flatbuffers/README.md b/cpp/thirdparty/flatbuffers/README.md new file mode 100644 index 000000000000..e955adba4ceb --- /dev/null +++ b/cpp/thirdparty/flatbuffers/README.md @@ -0,0 +1,42 @@ + + +This directory contains a vendored version of Flatbuffers +(unknown changeset), with the following patch for ARROW-15388: + +```diff +diff --git a/cpp/thirdparty/flatbuffers/include/flatbuffers/base.h b/cpp/thirdparty/flatbuffers/include/flatbuffers/base.h +index 955738067..fccce42f6 100644 +--- a/cpp/thirdparty/flatbuffers/include/flatbuffers/base.h ++++ b/cpp/thirdparty/flatbuffers/include/flatbuffers/base.h +@@ -212,13 +212,6 @@ namespace flatbuffers { + typedef std::experimental::string_view string_view; + } + #define FLATBUFFERS_HAS_STRING_VIEW 1 +- // Check for absl::string_view +- #elif __has_include("absl/strings/string_view.h") +- #include "absl/strings/string_view.h" +- namespace flatbuffers { +- typedef absl::string_view string_view; +- } +- #define FLATBUFFERS_HAS_STRING_VIEW 1 + #endif + #endif // __has_include + #endif // !FLATBUFFERS_HAS_STRING_VIEW +``` diff --git a/cpp/thirdparty/flatbuffers/include/flatbuffers/base.h b/cpp/thirdparty/flatbuffers/include/flatbuffers/base.h index 955738067234..fccce42f68aa 100644 --- a/cpp/thirdparty/flatbuffers/include/flatbuffers/base.h +++ b/cpp/thirdparty/flatbuffers/include/flatbuffers/base.h @@ -212,13 +212,6 @@ namespace flatbuffers { typedef std::experimental::string_view string_view; } #define FLATBUFFERS_HAS_STRING_VIEW 1 - // Check for absl::string_view - #elif __has_include("absl/strings/string_view.h") - #include "absl/strings/string_view.h" - namespace flatbuffers { - typedef absl::string_view string_view; - } - #define FLATBUFFERS_HAS_STRING_VIEW 1 #endif #endif // __has_include #endif // !FLATBUFFERS_HAS_STRING_VIEW