You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2020/06/23 23:19:41 UTC

[arrow] branch master updated: ARROW-8025: [C++][CI][FOLLOWUP] Fix test compilation failure due to conflicting changes in scalar_cast_test.cc

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 68ce980  ARROW-8025: [C++][CI][FOLLOWUP] Fix test compilation failure due to conflicting changes in scalar_cast_test.cc
68ce980 is described below

commit 68ce980653dc30f8038465d71025cbc63d13201a
Author: Wes McKinney <we...@apache.org>
AuthorDate: Tue Jun 23 18:19:19 2020 -0500

    ARROW-8025: [C++][CI][FOLLOWUP] Fix test compilation failure due to conflicting changes in scalar_cast_test.cc
    
    Closes #7529 from wesm/ARROW-8025-followup
    
    Authored-by: Wes McKinney <we...@apache.org>
    Signed-off-by: Wes McKinney <we...@apache.org>
---
 cpp/src/arrow/compute/kernels/scalar_cast_test.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp/src/arrow/compute/kernels/scalar_cast_test.cc b/cpp/src/arrow/compute/kernels/scalar_cast_test.cc
index 565f90f..92cce5c 100644
--- a/cpp/src/arrow/compute/kernels/scalar_cast_test.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_cast_test.cc
@@ -246,8 +246,8 @@ class TestCast : public TestBase {
     ArrayFromVector<SourceType, std::string>(src_type, valid, strings, &array);
     CheckZeroCopy(*array, dest_type);
 
-    CheckCase<SourceType, std::string, DestType, std::string>(
-        src_type, strings, all, dest_type, strings, options);
+    CheckCase<SourceType, DestType>(src_type, strings, all, dest_type, strings, options,
+                                    /*check_scalar=*/false);
   }
 
   template <typename DestType>