Remove use of is_same_v which is C++17, update test to use disable lambda flag

Erich Keane · Erich Keane · commit 9be624cfdac8 · 2021-06-30T07:23:35.000-07:00
diff --git a/sycl/include/CL/sycl/handler.hpp b/sycl/include/CL/sycl/handler.hpp
@@ -823,7 +823,7 @@ class __SYCL_EXPORT handler {
           getRangeRoundedKernelLambda<NameWT, TransformedArgType, Dims>(
               KernelFunc, NumWorkItems);
 
-      using KName = std::conditional_t<std::is_same_v<KernelType, NameT>,
+      using KName = std::conditional_t<std::is_same<KernelType, NameT>::value,
                                        decltype(Wrapper), NameWT>;
 
       range<Dims> AdjustedRange = NumWorkItems;
diff --git a/sycl/test/basic_tests/handler/unnamed-lambda-negative.cpp b/sycl/test/basic_tests/handler/unnamed-lambda-negative.cpp
@@ -1,4 +1,4 @@
-// RUN: %clangxx -Xclang -fsycl-is-host -std=c++17 -isystem %sycl_include/sycl -Xclang -verify -fsyntax-only %s -Xclang -verify-ignore-unexpected=note
+// RUN: %clangxx -Xclang -fsycl-is-host -std=c++17 -fno-sycl-unnamed-lambda -isystem %sycl_include/sycl -Xclang -verify -fsyntax-only %s -Xclang -verify-ignore-unexpected=note
 #include <CL/sycl.hpp>
 
 int main() {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %clangxx -Xclang -fsycl-is-host -std=c++17 -isystem %sycl_include/sycl -Xclang -verify -fsyntax-only %s -Xclang -verify-ignore-unexpected=note`
	`1`	`+// RUN: %clangxx -Xclang -fsycl-is-host -std=c++17 -fno-sycl-unnamed-lambda -isystem %sycl_include/sycl -Xclang -verify -fsyntax-only %s -Xclang -verify-ignore-unexpected=note`
`2`	`2`	`#include <CL/sycl.hpp>`
`3`	`3`
`4`	`4`	`int main() {`