Repository: arrow Updated Branches: refs/heads/master 5439b7158 -> f268e927a
ARROW-540: [C++] Build fixes after ARROW-33, PARQUET-866 Author: Wes McKinney <wes.mckin...@twosigma.com> Author: Wes McKinney <wesmck...@gmail.com> Closes #325 from wesm/ARROW-540 and squashes the following commits: 9070baf [Wes McKinney] Change DCHECK_LT to DCHECK_LE. Not sure why it fixes bug on OS X eb80701 [Wes McKinney] Fix API change Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/f268e927 Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/f268e927 Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/f268e927 Branch: refs/heads/master Commit: f268e927ada5cb637404769a136506c600582061 Parents: 5439b71 Author: Wes McKinney <wes.mckin...@twosigma.com> Authored: Tue Feb 7 15:37:33 2017 +0100 Committer: Uwe L. Korn <uw...@xhochy.com> Committed: Tue Feb 7 15:37:33 2017 +0100 ---------------------------------------------------------------------- cpp/src/arrow/buffer.cc | 2 +- cpp/src/arrow/column-benchmark.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/f268e927/cpp/src/arrow/buffer.cc ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/buffer.cc b/cpp/src/arrow/buffer.cc index fb5a010..18e9ed2 100644 --- a/cpp/src/arrow/buffer.cc +++ b/cpp/src/arrow/buffer.cc @@ -57,7 +57,7 @@ Status Buffer::Copy(int64_t start, int64_t nbytes, std::shared_ptr<Buffer>* out) std::shared_ptr<Buffer> SliceBuffer( const std::shared_ptr<Buffer>& buffer, int64_t offset, int64_t length) { - DCHECK_LT(offset, buffer->size()); + DCHECK_LE(offset, buffer->size()); DCHECK_LE(length, buffer->size() - offset); return std::make_shared<Buffer>(buffer, offset, length); } http://git-wip-us.apache.org/repos/asf/arrow/blob/f268e927/cpp/src/arrow/column-benchmark.cc ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/column-benchmark.cc b/cpp/src/arrow/column-benchmark.cc index 8a1c775..1bab5a8 100644 --- a/cpp/src/arrow/column-benchmark.cc +++ b/cpp/src/arrow/column-benchmark.cc @@ -30,7 +30,7 @@ std::shared_ptr<Array> MakePrimitive(int32_t length, int32_t null_count = 0) { auto null_bitmap = std::make_shared<PoolBuffer>(pool); data->Resize(length * sizeof(typename ArrayType::value_type)); null_bitmap->Resize(BitUtil::BytesForBits(length)); - return std::make_shared<ArrayType>(length, data, 10, null_bitmap); + return std::make_shared<ArrayType>(length, data, null_bitmap, 10); } } // anonymous namespace