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

wesm · wesm · commit 68ce980653dc · 2020-06-23T18:19:19.000-05:00
Closes #7529 from wesm/ARROW-8025-followup Authored-by: Wes McKinney <wesm@apache.org> Signed-off-by: Wes McKinney <wesm@apache.org>
diff --git 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>

Original file line number	Diff line number	Diff line change
`@@ -246,8 +246,8 @@ class TestCast : public TestBase {`
`246`	`246`	`ArrayFromVector<SourceType, std::string>(src_type, valid, strings, &array);`
`247`	`247`	`CheckZeroCopy(*array, dest_type);`
`248`	`248`
`249`		`- CheckCase<SourceType, std::string, DestType, std::string>(`
`250`		`- src_type, strings, all, dest_type, strings, options);`
	`249`	`+ CheckCase<SourceType, DestType>(src_type, strings, all, dest_type, strings, options,`
	`250`	`+ /check_scalar=/false);`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`template <typename DestType>`