mirrors/arrow
0
0 Fork 0
mirror of https://github.com/apache/arrow.git synced 2026-10-29 09:05:47 +08:00
Code Activity

Fix git merge error

Browse Source
This commit is contained in:
Antoine Pitrou committed 2019-12-18 11:57:08 +01:00
1 parent 7d0b864bfc
commit c789812d02
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
python/pyarrow/includes/libarrow.pxd
+1 -1
View File
@@ -486,6 +486,7 @@ cdef extern from "arrow/api.h" namespace "arrow" nogil:
int64_t value_offset(int i)
int64_t value_length(int i)
shared_ptr[CArray] values()
CResult[shared_ptr[CArray]] Flatten(CMemoryPool* memory_pool)
shared_ptr[CDataType] value_type()
cdef cppclass CFixedSizeListArray" arrow::FixedSizeListArray"(CArray):
@@ -496,7 +497,6 @@ cdef extern from "arrow/api.h" namespace "arrow" nogil:
int64_t value_offset(int i)
int64_t value_length(int i)
shared_ptr[CArray] values()
CResult[shared_ptr[CArray]] Flatten(CMemoryPool* memory_pool)
shared_ptr[CDataType] value_type()
cdef cppclass CMapArray" arrow::MapArray"(CArray):