[arrow] branch master updated: ARROW-5567: [C++] Fix build error of memory-benchmark

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 9f52759  ARROW-5567: [C++] Fix build error of memory-benchmark
9f52759 is described below

commit 9f527598a139f9f758f638eabcf6c13ea4a6c9bd
Author: Yuqi Gu <yu...@arm.com>
AuthorDate: Mon Jun 17 20:41:21 2019 -0500

    ARROW-5567: [C++] Fix build error of memory-benchmark
    
    'memory-benchmark.cc' is implemented by x86 AVX and SSE instructions.
    Build would failed on Arm64 when DARROW_BUILD_BENCHMARKS is enabled.
    
    Author: Yuqi Gu <yu...@arm.com>
    Author: Wes McKinney <we...@apache.org>
    
    Closes #4528 from guyuqi/ARROW-5567 and squashes the following commits:
    
    b058450aa <Wes McKinney> Rely on arrow/util/sse-util.h for SSE4.2-related flags and includes
    52bf6ed7e <Yuqi Gu> Use Macro __SSE4_2__
    8cc81e89e <Yuqi Gu> Fix build error of memory-benchmark
---
 cpp/src/arrow/io/memory-benchmark.cc | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/cpp/src/arrow/io/memory-benchmark.cc b/cpp/src/arrow/io/memory-benchmark.cc
index a3676e4..a75aa2e 100644
--- a/cpp/src/arrow/io/memory-benchmark.cc
+++ b/cpp/src/arrow/io/memory-benchmark.cc
@@ -15,12 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#ifdef _MSC_VER
-#include <intrin.h>
-#else
-#include <immintrin.h>
-#endif
-
 #include <iostream>
 
 #include "arrow/api.h"
@@ -28,9 +22,11 @@
 #include "arrow/testing/gtest_util.h"
 #include "arrow/testing/util.h"
 #include "arrow/util/cpu-info.h"
+#include "arrow/util/sse-util.h"
 
 #include "benchmark/benchmark.h"
 
+#ifdef ARROW_HAVE_SSE4_2
 namespace arrow {
 
 using internal::CpuInfo;
@@ -229,3 +225,4 @@ BENCHMARK(ParallelMemoryCopy)
     ->UseRealTime();
 
 }  // namespace arrow
+#endif  // ARROW_HAVE_SSE4_2