(Intermediate) Maybe fix for CWG1835.

llvm/llvm-project#98547

Author: fodinabor

include/hipSYCL/sycl/libkernel/accessor.hpp

@@ -1067,7 +1067,7 @@ class HIPSYCL_EMPTY_BASES accessor
   {
     if constexpr (has_accessor_properties) {
       return this->detail::accessor::conditional_accessor_properties_storage<
-          has_accessor_properties>::get().is_placeholder();
+          has_accessor_properties>::template get().is_placeholder();
     } else if constexpr (AccessorVariant ==
                              accessor_variant::ranged_placeholder ||
                          AccessorVariant ==
@@ -1128,10 +1128,10 @@ class HIPSYCL_EMPTY_BASES accessor
   ACPP_UNIVERSAL_TARGET range<dimensions> get_range() const noexcept {
     if constexpr(has_access_range) {
       return this->detail::accessor::conditional_access_range_storage<
-          has_access_range, dimensions>::ptr()->range;
+          has_access_range, dimensions>::template ptr()->range;
     } else if constexpr(has_buffer_range) {
       return this->detail::accessor::conditional_buffer_range_storage<
-          has_buffer_range, dimensions>::get();
+          has_buffer_range, dimensions>::template get();
     } else {
       return sycl::range<dimensions>{};
     }
@@ -1147,7 +1147,7 @@ class HIPSYCL_EMPTY_BASES accessor
       return sycl::id<dimensions>{};
     } else {
       return this->detail::accessor::conditional_access_range_storage<
-          has_access_range, dimensions>::ptr()->offset;
+          has_access_range, dimensions>::template ptr()->offset;
     }
   }
 
@@ -1330,7 +1330,7 @@ class HIPSYCL_EMPTY_BASES accessor
       is_no_init_access = this->is_no_init(prop_list);
 
       this->detail::accessor::conditional_accessor_properties_storage<
-          has_accessor_properties>::
+          has_accessor_properties>::template 
           attempt_set(detail::accessor::accessor_properties{
               is_placeholder_access, is_no_init_access});
     }
@@ -1356,7 +1356,7 @@ class HIPSYCL_EMPTY_BASES accessor
 
     if constexpr (has_accessor_properties) {
       this->detail::accessor::conditional_accessor_properties_storage<
-          has_accessor_properties>::
+          has_accessor_properties>::template 
           attempt_set(detail::accessor::accessor_properties{
               is_placeholder_access, is_no_init_access});
     }
@@ -1390,7 +1390,7 @@ class HIPSYCL_EMPTY_BASES accessor
   range<adj_dimensions> get_buffer_shape() const noexcept {
     if constexpr(has_buffer_range) {
       return this->detail::accessor::conditional_buffer_range_storage<
-          has_buffer_range, adj_dimensions>::get();
+          has_buffer_range, adj_dimensions>::template get();
     } else {
       return range<adj_dimensions>{};
     }
@@ -1401,7 +1401,7 @@ class HIPSYCL_EMPTY_BASES accessor
     if constexpr(has_buffer_pointer) {
       return this
           ->detail::accessor::conditional_buffer_pointer_storage<
-              has_buffer_pointer>::get()
+              has_buffer_pointer>::template get()
           .get_shared_ptr();
     }
     return nullptr;
@@ -1414,18 +1414,18 @@ class HIPSYCL_EMPTY_BASES accessor
     __acpp_if_target_host(
       auto buffer_region = detail::extract_buffer_data_region(buff);
       this->detail::accessor::
-          conditional_buffer_pointer_storage<has_buffer_pointer>::attempt_set(
+          conditional_buffer_pointer_storage<has_buffer_pointer>::template attempt_set(
               detail::mobile_shared_ptr{buffer_region});
     );
 
     this->detail::accessor::conditional_access_range_storage<
         has_access_range,
-        adj_dimensions>::attempt_set(detail::accessor::access_range<adj_dimensions>{
+        adj_dimensions>::template attempt_set(detail::accessor::access_range<adj_dimensions>{
         accessOffset, accessRange});
 
     this->detail::accessor::conditional_buffer_range_storage<
         has_buffer_range,
-        adj_dimensions>::attempt_set(detail::extract_buffer_range(buff));
+        adj_dimensions>::template attempt_set(detail::extract_buffer_range(buff));
   }
 
   void init_host_buffer(rt::runtime* rt, bool is_no_init) {
@@ -1434,7 +1434,7 @@ class HIPSYCL_EMPTY_BASES accessor
 
     auto data_mobile_ptr =
         this->detail::accessor::conditional_buffer_pointer_storage<
-            has_buffer_pointer>::get();
+            has_buffer_pointer>::template get();
     auto data = data_mobile_ptr.get_shared_ptr();
     assert(data);
 
@@ -1534,7 +1534,7 @@ class HIPSYCL_EMPTY_BASES accessor
   bool is_no_init() {
     if(has_accessor_properties) {
       bool flag = this->detail::accessor::conditional_accessor_properties_storage<
-              has_accessor_properties>::ptr()
+              has_accessor_properties>::template ptr()
           ->is_no_init();
       if(flag)
         return true;