Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E5AB6200B95 for ; Tue, 13 Sep 2016 05:15:19 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E43ED160AC8; Tue, 13 Sep 2016 03:15:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 36685160AB8 for ; Tue, 13 Sep 2016 05:15:19 +0200 (CEST) Received: (qmail 87761 invoked by uid 500); 13 Sep 2016 03:15:18 -0000 Mailing-List: contact commits-help@arrow.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@arrow.apache.org Delivered-To: mailing list commits@arrow.apache.org Received: (qmail 87752 invoked by uid 99); 13 Sep 2016 03:15:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Sep 2016 03:15:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B7779E0061; Tue, 13 Sep 2016 03:15:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wesm@apache.org To: commits@arrow.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: arrow git commit: ARROW-289: Install test-util.h Date: Tue, 13 Sep 2016 03:15:17 +0000 (UTC) archived-at: Tue, 13 Sep 2016 03:15:20 -0000 Repository: arrow Updated Branches: refs/heads/master 077c72bc6 -> 6b8abb440 ARROW-289: Install test-util.h Author: Uwe L. Korn Closes #135 from xhochy/arrow-289 and squashes the following commits: 5e4aadf [Uwe L. Korn] ARROW-289: Install test-util.h Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/6b8abb44 Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/6b8abb44 Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/6b8abb44 Branch: refs/heads/master Commit: 6b8abb4402ff1f39fc5944a7df6e3b4755691d87 Parents: 077c72b Author: Uwe L. Korn Authored: Mon Sep 12 23:15:10 2016 -0400 Committer: Wes McKinney Committed: Mon Sep 12 23:15:10 2016 -0400 ---------------------------------------------------------------------- cpp/src/arrow/CMakeLists.txt | 1 + cpp/src/arrow/test-util.h | 12 ++++++------ cpp/src/arrow/util/CMakeLists.txt | 1 + cpp/src/arrow/util/bit-util.h | 4 +++- 4 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/6b8abb44/cpp/src/arrow/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt index 2d42edc..a9b2fec 100644 --- a/cpp/src/arrow/CMakeLists.txt +++ b/cpp/src/arrow/CMakeLists.txt @@ -24,6 +24,7 @@ install(FILES schema.h table.h type.h + test-util.h DESTINATION include/arrow) ####################################### http://git-wip-us.apache.org/repos/asf/arrow/blob/6b8abb44/cpp/src/arrow/test-util.h ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/test-util.h b/cpp/src/arrow/test-util.h index 055dac7..e632ffb 100644 --- a/cpp/src/arrow/test-util.h +++ b/cpp/src/arrow/test-util.h @@ -40,22 +40,22 @@ #define ASSERT_RAISES(ENUM, expr) \ do { \ - Status s = (expr); \ + ::arrow::Status s = (expr); \ if (!s.Is##ENUM()) { FAIL() << s.ToString(); } \ } while (0) #define ASSERT_OK(expr) \ do { \ - Status s = (expr); \ + ::arrow::Status s = (expr); \ if (!s.ok()) { FAIL() << s.ToString(); } \ } while (0) #define ASSERT_OK_NO_THROW(expr) ASSERT_NO_THROW(ASSERT_OK(expr)) -#define EXPECT_OK(expr) \ - do { \ - Status s = (expr); \ - EXPECT_TRUE(s.ok()); \ +#define EXPECT_OK(expr) \ + do { \ + ::arrow::Status s = (expr); \ + EXPECT_TRUE(s.ok()); \ } while (0) namespace arrow { http://git-wip-us.apache.org/repos/asf/arrow/blob/6b8abb44/cpp/src/arrow/util/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/util/CMakeLists.txt b/cpp/src/arrow/util/CMakeLists.txt index 13c0d75..fd23c1a 100644 --- a/cpp/src/arrow/util/CMakeLists.txt +++ b/cpp/src/arrow/util/CMakeLists.txt @@ -26,6 +26,7 @@ install(FILES logging.h macros.h memory-pool.h + random.h status.h visibility.h DESTINATION include/arrow/util) http://git-wip-us.apache.org/repos/asf/arrow/blob/6b8abb44/cpp/src/arrow/util/bit-util.h ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/util/bit-util.h b/cpp/src/arrow/util/bit-util.h index a6c8dd9..873a195 100644 --- a/cpp/src/arrow/util/bit-util.h +++ b/cpp/src/arrow/util/bit-util.h @@ -22,6 +22,8 @@ #include #include +#include "arrow/util/visibility.h" + namespace arrow { class Buffer; @@ -76,7 +78,7 @@ static inline bool is_multiple_of_64(int64_t n) { } void bytes_to_bits(const std::vector& bytes, uint8_t* bits); -Status bytes_to_bits(const std::vector&, std::shared_ptr*); +ARROW_EXPORT Status bytes_to_bits(const std::vector&, std::shared_ptr*); } // namespace util