From bc5bea137508242961adac2d0d3f0b11618887f4 Mon Sep 17 00:00:00 2001
From: Wes McKinney <wesm@apache.org>
Date: Tue, 23 Jun 2020 18:02:19 -0500
Subject: [PATCH 1/2] Fix test compilation failure

---
 cpp/src/arrow/compute/kernels/scalar_cast_test.cc | 3 +--
 1 file changed, 1 insertion(+), 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 565f90f53a5..a23161bd09b 100644
--- a/cpp/src/arrow/compute/kernels/scalar_cast_test.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_cast_test.cc
@@ -246,8 +246,7 @@ 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);
   }
 
   template <typename DestType>

From a10b1dd24c7e262f0e23e283af72c5dca3d76842 Mon Sep 17 00:00:00 2001
From: Wes McKinney <wesm@apache.org>
Date: Tue, 23 Jun 2020 18:09:21 -0500
Subject: [PATCH 2/2] scalar casts not supported

---
 cpp/src/arrow/compute/kernels/scalar_cast_test.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cpp/src/arrow/compute/kernels/scalar_cast_test.cc b/cpp/src/arrow/compute/kernels/scalar_cast_test.cc
index a23161bd09b..92cce5c3ec8 100644
--- a/cpp/src/arrow/compute/kernels/scalar_cast_test.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_cast_test.cc
@@ -246,7 +246,8 @@ class TestCast : public TestBase {
     ArrayFromVector<SourceType, std::string>(src_type, valid, strings, &array);
     CheckZeroCopy(*array, dest_type);
 
-    CheckCase<SourceType, DestType>(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>