diff options
| author | Tanguy Fautre <GPSnoopy@users.noreply.github.com> | 2020-04-17 22:04:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 14:04:06 -0700 |
| commit | 89741c2d6866b0fcde541bd9d618bf749bd2238e (patch) | |
| tree | 6f00c18a9f9efb82cc1bc5d57cf6c15c6f05c804 | |
| parent | 1d0aca7435b5fbaa28985b0e7183ee835328f6e9 (diff) | |
| download | vcpkg-89741c2d6866b0fcde541bd9d618bf749bd2238e.tar.gz vcpkg-89741c2d6866b0fcde541bd9d618bf749bd2238e.zip | |
Updated Arrow to 0.17 (#10883)
| -rw-r--r-- | ports/arrow/CONTROL | 2 | ||||
| -rw-r--r-- | ports/arrow/all.patch | 31 | ||||
| -rw-r--r-- | ports/arrow/portfile.cmake | 4 |
3 files changed, 3 insertions, 34 deletions
diff --git a/ports/arrow/CONTROL b/ports/arrow/CONTROL index 5e2b86981..23bc90eb0 100644 --- a/ports/arrow/CONTROL +++ b/ports/arrow/CONTROL @@ -1,5 +1,5 @@ Source: arrow -Version: 0.16.0 +Version: 0.17.0 Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, bzip2, zstd, snappy, gflags, thrift, double-conversion, glog, uriparser, openssl Homepage: https://github.com/apache/arrow Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations. 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_; diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index c67e61230..06561a906 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/arrow - REF apache-arrow-0.16.0 - SHA512 c8d693e927218c65526b48f18c4f00f9530d1a8731575b051b017a5350e68114c16dcd41ff578b4c0cc29cc79096621809658b8eac250934ecf0fcaabadf2cf6 + REF apache-arrow-0.17.0 + SHA512 293737db80defa0f8766f726dc228ace50936f7124647de15c2e024c2901ded1cda893d771d38aa4e9ab19ff7eb06b11dfc230587ca5b17cdd87e681fc3009ca HEAD_REF master PATCHES all.patch |