Skip to content

Commit 4510a11

Browse files
committed
Fix compilation errors.
1 parent 2c3b5d9 commit 4510a11

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

Diff for: matlab/src/cpp/arrow/matlab/io/ipc/proxy/record_batch_stream_reader.cc

+13-8
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ RecordBatchStreamReader::RecordBatchStreamReader(
3939
}
4040

4141
libmexclass::proxy::MakeResult RecordBatchStreamReader::fromFile(const libmexclass::proxy::FunctionArguments& constructor_arguments) {
42+
namespace mda = ::matlab::data;
43+
using RecordBatchStreamReaderProxy =
44+
arrow::matlab::io::ipc::proxy::RecordBatchStreamReader;
45+
4246
const mda::StructArray opts = constructor_arguments[0];
4347
const mda::StringArray filename_mda = opts[0]["Filename"];
4448
const auto filename_utf16 = std::u16string(filename_mda[0]);
@@ -57,10 +61,14 @@ libmexclass::proxy::MakeResult RecordBatchStreamReader::fromFile(const libmexcla
5761
}
5862

5963
libmexclass::proxy::MakeResult RecordBatchStreamReader::fromBytes(const libmexclass::proxy::FunctionArguments& constructor_arguments) {
64+
namespace mda = ::matlab::data;
65+
using RecordBatchStreamReaderProxy =
66+
arrow::matlab::io::ipc::proxy::RecordBatchStreamReader;
67+
6068
const mda::StructArray opts = constructor_arguments[0];
6169
const ::matlab::data::TypedArray<uint8_t> bytes_mda = opts[0]["Bytes"];
62-
const auto matlab_buffer = std::make_shared<matlab::arrow::MatlabBuffer>(bytes_mda);
63-
auto buffer_reader = std::make_shared<arrow::io::memory::BufferReader>(matlab_buffer);
70+
const auto matlab_buffer = std::make_shared<arrow::matlab::buffer::MatlabBuffer>(bytes_mda);
71+
auto buffer_reader = std::make_shared<arrow::io::BufferReader>(matlab_buffer);
6472
MATLAB_ASSIGN_OR_ERROR(auto reader,
6573
arrow::ipc::RecordBatchStreamReader::Open(buffer_reader),
6674
error::IPC_RECORD_BATCH_READER_OPEN_FAILED);
@@ -69,19 +77,16 @@ libmexclass::proxy::MakeResult RecordBatchStreamReader::fromBytes(const libmexcl
6977

7078
libmexclass::proxy::MakeResult RecordBatchStreamReader::make(
7179
const libmexclass::proxy::FunctionArguments& constructor_arguments) {
72-
namespace mda = ::matlab::data;
73-
using RecordBatchStreamReaderProxy =
74-
arrow::matlab::io::ipc::proxy::RecordBatchStreamReader;
75-
80+
namespace mda = ::matlab::data;
7681
const mda::StructArray opts = constructor_arguments[0];
7782

7883
// Dispatch to the appropriate static "make" method depending
7984
// on the input type.
8085
const mda::StringArray type_mda = opts[0]["Type"];
8186
const auto type_utf16 = std::u16string(type_mda[0]);
82-
if (type_utf16.equals(u"Bytes")) {
87+
if (type_utf16 == u"Bytes") {
8388
return RecordBatchStreamReader::fromBytes(constructor_arguments);
84-
} else if (type_utf16.equals(u"Filename")) {
89+
} else if (type_utf16 == u"Filename") {
8590
return RecordBatchStreamReader::fromFile(constructor_arguments);
8691
} else {
8792
// TODO: Create static error id string

0 commit comments

Comments
 (0)