rebase

NonVolatileComputing · Aug 15, 2017 · 30bb960 · 30bb960
1 parent f229d8d
commit 30bb960
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cpp/src/arrow/python/dict.cc b/cpp/src/arrow/python/dict.cc
@@ -31,7 +31,7 @@ Status DictBuilder::Finish(std::shared_ptr<Array> key_tuple_data,
   auto keys_field = std::make_shared<Field>("keys", keys->type());
   auto vals_field = std::make_shared<Field>("vals", vals->type());
   auto type =
-      std::make_shared<StructType>(std::vector<FieldPtr>({keys_field, vals_field}));
+      std::make_shared<StructType>(std::vector<std::shared_ptr<Field>>({keys_field, vals_field}));
   std::vector<std::shared_ptr<Array>> field_arrays({keys, vals});
   DCHECK(keys->length() == vals->length());
   out->reset(new StructArray(type, keys->length(), field_arrays));

diff --git a/cpp/src/arrow/python/sequence.cc b/cpp/src/arrow/python/sequence.cc
@@ -126,7 +126,7 @@ Status SequenceBuilder::AppendDict(int32_t size) {
     std::shared_ptr<Array> list_array;                                        \
     ListArray::FromArrays(*offset_array, *DATA, pool_, &list_array);          \
     auto field = std::make_shared<Field>(NAME, list_array->type());           \
-    auto type = std::make_shared<StructType>(std::vector<FieldPtr>({field})); \
+    auto type = std::make_shared<StructType>(std::vector<std::shared_ptr<Field>>({field})); \
     types[TAG] = std::make_shared<Field>("", type);                           \
     children[TAG] = std::shared_ptr<StructArray>(                             \
         new StructArray(type, list_array->length(), {list_array}));           \

diff --git a/cpp/src/arrow/python/sequence.h b/cpp/src/arrow/python/sequence.h
@@ -26,7 +26,7 @@ namespace arrow {
 class NullArrayBuilder : public arrow::ArrayBuilder {
  public:
   explicit NullArrayBuilder(arrow::MemoryPool* pool, const arrow::TypePtr& type)
-      : arrow::ArrayBuilder(pool, type) {}
+      : arrow::ArrayBuilder(type, pool) {}
   virtual ~NullArrayBuilder(){};
   arrow::Status Finish(std::shared_ptr<arrow::Array>* out) override {
     return arrow::Status::OK();