From 6ebf7d461a005eee380e4a93f79e4e28b5d8704c Mon Sep 17 00:00:00 2001 From: Sarah Gilmore Date: Thu, 3 Aug 2023 12:15:35 -0400 Subject: [PATCH] Fix compiler error --- .../src/cpp/arrow/matlab/array/proxy/wrap.cc | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/matlab/src/cpp/arrow/matlab/array/proxy/wrap.cc b/matlab/src/cpp/arrow/matlab/array/proxy/wrap.cc index 2538afdd38bf8..2971b0ccd0a70 100644 --- a/matlab/src/cpp/arrow/matlab/array/proxy/wrap.cc +++ b/matlab/src/cpp/arrow/matlab/array/proxy/wrap.cc @@ -15,15 +15,12 @@ // specific language governing permissions and limitations // under the License. -#pragma once - -#include "arrow/array.h" -#include "arrow/result.h" +#include "arrow/matlab/array/proxy/wrap.h" #include "arrow/matlab/array/proxy/array.h" #include "arrow/matlab/array/proxy/boolean_array.h" #include "arrow/matlab/array/proxy/numeric_array.h" -#include "arrow/matlab/array/proxy/string-array.h" +#include "arrow/matlab/array/proxy/string_array.h" namespace arrow::matlab::array::proxy { @@ -32,9 +29,9 @@ namespace arrow::matlab::array::proxy { using ID = arrow::Type::type; switch (array->type_id()) { case ID::BOOL: - return std::make_shared(std::static_pointer_cast(type)); + return std::make_shared(std::static_pointer_cast(array)); case ID::UINT8: - return std::make_shared>(std::static_pointer_cast(type)); + return std::make_shared>(std::static_pointer_cast(array)); case ID::UINT16: return std::make_shared>(std::static_pointer_cast(array)); case ID::UINT32: @@ -44,15 +41,15 @@ namespace arrow::matlab::array::proxy { case ID::INT8: return std::make_shared>(std::static_pointer_cast(array)); case ID::INT16: - return std::make_shared>(std::static_pointer_cast(array)); + return std::make_shared>(std::static_pointer_cast(array)); case ID::INT32: - return std::make_shared>(std::static_pointer_cast(array)); + return std::make_shared>(std::static_pointer_cast(array)); case ID::INT64: - return std::make_shared>(std::static_pointer_cast(array)); + return std::make_shared>(std::static_pointer_cast(array)); case ID::FLOAT: return std::make_shared>(std::static_pointer_cast(array)); case ID::DOUBLE: - return std::make_shared>(std::static_pointer_cast(array)); + return std::make_shared>(std::static_pointer_cast(array)); case ID::TIMESTAMP: return std::make_shared>(std::static_pointer_cast(array)); case ID::STRING: