[SYCL] simplify changes

Author: dklochkov-emb

sycl/include/sycl/functional.hpp

@@ -27,9 +27,9 @@ template <typename T = void>
 struct logical_and
 #ifdef __INTEL_PREVIEW_BREAKING_CHANGES
     : std::logical_and<T>
-#endif
 {
-#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
+#else
+{
   T operator()(const T &lhs, const T &rhs) const { return lhs && rhs; }
 #endif
 }; // namespace _V1
@@ -42,9 +42,9 @@ template <typename T = void>
 struct logical_or
 #ifdef __INTEL_PREVIEW_BREAKING_CHANGES
     : std::logical_or<T>
-#endif
 {
-#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
+#else
+{
   T operator()(const T &lhs, const T &rhs) const { return lhs || rhs; }
 #endif
 }; // namespace sycl

sycl/test/basic_tests/logical_operations.cpp

@@ -1,7 +1,7 @@
 // RUN: %clang -fpreview-breaking-changes -fsycl -o - %s
 // RUN: not %clang -fpreview-breaking-changes -fsycl -DTEST_VOID_TYPES -o - %s
 // RUN: %clang -fsycl -o - %s
-// RUN: not %clang -fsycl -DTEST_VOID_TYPES -o - %s
+// RUN: not %clang -fsycl -fsyntax-only -DTEST_VOID_TYPES -o - %s
 
 #include <cassert>
 #include <sycl/functional.hpp>