fix guidelines comments

Signed-off-by: iburylov <[email protected]>

Author: iburylov

sycl/include/CL/sycl/detail/accessor_impl.hpp

@@ -195,22 +195,26 @@ constexpr access::mode deduceAccessMode() {
                 std::is_same<MayBeTag2,
                              mode_tag_t<access::mode::read>>::value) {
     return access::mode::read;
-  } else if constexpr (std::is_same<MayBeTag1,
-                                    mode_tag_t<access::mode::write>>::value ||
-                       std::is_same<MayBeTag2,
-                                    mode_tag_t<access::mode::write>>::value) {
+  }
+
+  if constexpr (std::is_same<MayBeTag1,
+                             mode_tag_t<access::mode::write>>::value ||
+                std::is_same<MayBeTag2,
+                             mode_tag_t<access::mode::write>>::value) {
     return access::mode::write;
-  } else if constexpr (
+  }
+
+  if constexpr (
       std::is_same<MayBeTag1,
                    mode_target_tag_t<access::mode::read,
                                      access::target::constant_buffer>>::value ||
       std::is_same<MayBeTag2,
                    mode_target_tag_t<access::mode::read,
                                      access::target::constant_buffer>>::value) {
     return access::mode::read;
-  } else {
-    return access::mode::read_write;
   }
+
+  return access::mode::read_write;
 }
 
 template <typename MayBeTag1, typename MayBeTag2>
@@ -223,9 +227,9 @@ constexpr access::target deduceAccessTarget(access::target defaultTarget) {
                    mode_target_tag_t<access::mode::read,
                                      access::target::constant_buffer>>::value) {
     return access::target::constant_buffer;
-  } else {
-    return defaultTarget;
   }
+
+  return defaultTarget;
 }
 
 #endif

sycl/test/basic_tests/accessor/Inputs/device_accessor.cpp

@@ -8,10 +8,6 @@
 #include <CL/sycl.hpp>
 #include <cassert>
 
-namespace sycl {
-using namespace cl::sycl;
-}
-
 int main() {
   // Non-placeholder accessors.
   {

sycl/test/basic_tests/accessor/Inputs/host_accessor.cpp

@@ -8,10 +8,6 @@
 #include <CL/sycl.hpp>
 #include <cassert>
 
-namespace sycl {
-using namespace cl::sycl;
-}
-
 int main() {
   {
     int data[3] = {3, 7, 9};

sycl/test/basic_tests/accessor/accessor.cpp

@@ -14,10 +14,6 @@
 #include <CL/sycl.hpp>
 #include <cassert>
 
-namespace sycl {
-using namespace cl::sycl;
-}
-
 struct IdxID1 {
   int x;