Skip to content

ARROW-1202: [C++] Remove semicolons from status macros #828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cpcloud wants to merge 1 commit into from
Closed

ARROW-1202: [C++] Remove semicolons from status macros #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cpp/src/arrow/ipc/feather.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ class TableWriter::TableWriterImpl : public ArrayVisitor {
// Write the variable-length offsets
RETURN_NOT_OK(WritePadded(stream_.get(),
reinterpret_cast<const uint8_t*>(bin_values.raw_value_offsets()), offset_bytes,
&bytes_written))
&bytes_written));
meta->total_bytes += bytes_written;

if (bin_values.data()) { values_buffer = bin_values.data()->data(); }
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/ipc/reader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ class RecordBatchStreamReader::RecordBatchStreamReaderImpl {
RETURN_NOT_OK(ReadNextMessage(Message::DICTIONARY_BATCH, false, &message));

std::shared_ptr<Buffer> batch_body;
RETURN_NOT_OK(ReadExact(message->body_length(), &batch_body))
RETURN_NOT_OK(ReadExact(message->body_length(), &batch_body));
io::BufferReader reader(batch_body);

std::shared_ptr<Array> dictionary;
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/arrow/status.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
do { \
::arrow::Status _s = (s); \
if (ARROW_PREDICT_FALSE(!_s.ok())) { return _s; } \
} while (0);
} while (0)

// If 'to_call' returns a bad status, CHECK immediately with a logged message
// of 'msg' followed by the status.
#define ARROW_CHECK_OK_PREPEND(to_call, msg) \
do { \
::arrow::Status _s = (to_call); \
ARROW_CHECK(_s.ok()) << (msg) << ": " << _s.ToString(); \
} while (0);
} while (0)

// If the status is bad, CHECK immediately, appending the status to the
// logged message.
Expand All @@ -47,7 +47,7 @@ namespace arrow {
do { \
Status _s = (s); \
if (ARROW_PREDICT_FALSE(!_s.ok())) { return _s; } \
} while (0);
} while (0)

#define RETURN_NOT_OK_ELSE(s, else_) \
do { \
Expand All @@ -56,7 +56,7 @@ namespace arrow {
else_; \
return _s; \
} \
} while (0);
} while (0)

enum class StatusCode : char {
OK = 0,
Expand Down