arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject arrow git commit: ARROW-1202: [C++] Remove semicolons from status macros
Date Mon, 10 Jul 2017 17:27:26 GMT
Repository: arrow
Updated Branches:
  refs/heads/master f73c1c3bb -> cab07c2bd


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

Author: Phillip Cloud <cpcloud@gmail.com>

Closes #828 from cpcloud/ARROW-1202 and squashes the following commits:

50ba53a [Phillip Cloud] ARROW-1202: [C++] Remove semicolons from status macros


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/cab07c2b
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/cab07c2b
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/cab07c2b

Branch: refs/heads/master
Commit: cab07c2bd655160930199160ac52c91b3ff0fba4
Parents: f73c1c3
Author: Phillip Cloud <cpcloud@gmail.com>
Authored: Mon Jul 10 19:27:22 2017 +0200
Committer: Uwe L. Korn <uwelk@xhochy.com>
Committed: Mon Jul 10 19:27:22 2017 +0200

----------------------------------------------------------------------
 cpp/src/arrow/ipc/feather.cc | 2 +-
 cpp/src/arrow/ipc/reader.cc  | 2 +-
 cpp/src/arrow/status.h       | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/cab07c2b/cpp/src/arrow/ipc/feather.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/ipc/feather.cc b/cpp/src/arrow/ipc/feather.cc
index 7f577a0..bc7c431 100644
--- a/cpp/src/arrow/ipc/feather.cc
+++ b/cpp/src/arrow/ipc/feather.cc
@@ -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(); }

http://git-wip-us.apache.org/repos/asf/arrow/blob/cab07c2b/cpp/src/arrow/ipc/reader.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/ipc/reader.cc b/cpp/src/arrow/ipc/reader.cc
index cb747b6..ea16bf0 100644
--- a/cpp/src/arrow/ipc/reader.cc
+++ b/cpp/src/arrow/ipc/reader.cc
@@ -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;

http://git-wip-us.apache.org/repos/asf/arrow/blob/cab07c2b/cpp/src/arrow/status.h
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/status.h b/cpp/src/arrow/status.h
index 448f4fa..8491ac8 100644
--- a/cpp/src/arrow/status.h
+++ b/cpp/src/arrow/status.h
@@ -27,7 +27,7 @@
   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.
@@ -35,7 +35,7 @@
   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.
@@ -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 {                               \
@@ -56,7 +56,7 @@ namespace arrow {
       else_;                         \
       return _s;                     \
     }                                \
-  } while (0);
+  } while (0)
 
 enum class StatusCode : char {
   OK = 0,


Mime
View raw message