aboutsummaryrefslogtreecommitdiff
path: root/ports/arrow/all.patch
diff options
context:
space:
mode:
authorTanguy Fautre <GPSnoopy@users.noreply.github.com>2020-04-17 22:04:06 +0100
committerGitHub <noreply@github.com>2020-04-17 14:04:06 -0700
commit89741c2d6866b0fcde541bd9d618bf749bd2238e (patch)
tree6f00c18a9f9efb82cc1bc5d57cf6c15c6f05c804 /ports/arrow/all.patch
parent1d0aca7435b5fbaa28985b0e7183ee835328f6e9 (diff)
downloadvcpkg-89741c2d6866b0fcde541bd9d618bf749bd2238e.tar.gz
vcpkg-89741c2d6866b0fcde541bd9d618bf749bd2238e.zip
Updated Arrow to 0.17 (#10883)
Diffstat (limited to 'ports/arrow/all.patch')
-rw-r--r--ports/arrow/all.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/ports/arrow/all.patch b/ports/arrow/all.patch
index 3b2bdad2f..dc807d471 100644
--- a/ports/arrow/all.patch
+++ b/ports/arrow/all.patch
@@ -144,34 +144,3 @@ index 75b33c2..80cac9a 100644
else()
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Werror")
endif()
-diff --git a/cpp/src/arrow/stl.h b/cpp/src/arrow/stl.h
-index 7ae9eaf..b9efdcb 100644
---- a/cpp/src/arrow/stl.h
-+++ b/cpp/src/arrow/stl.h
-@@ -518,6 +518,9 @@ class allocator {
-
- private:
- MemoryPool* pool_;
-+
-+ template <class U>
-+ friend class allocator;
- };
-
- /// \brief A MemoryPool implementation delegating allocations to a STL allocator
-diff --git a/cpp/src/parquet/schema.h b/cpp/src/parquet/schema.h
-index 87db4de..095ef9a 100644
---- a/cpp/src/parquet/schema.h
-+++ b/cpp/src/parquet/schema.h
-@@ -460,7 +460,11 @@ class PARQUET_EXPORT SchemaDescriptor {
- // -- -- b |
- // -- -- -- c |
- // -- -- -- -- d
-- std::unordered_map<int, const schema::NodePtr> leaf_to_base_;
-+#if _MSC_VER >= 1900
-+ std::unordered_map<int, schema::NodePtr> leaf_to_base_;
-+#else
-+ std::unordered_map<int, const schema::NodePtr> leaf_to_base_;
-+#endif
-
- // Mapping between ColumnPath DotString to the leaf index
- std::unordered_multimap<std::string, int> leaf_to_idx_;