From c4f617e4dd9484d6816b253dbe688b0f948ad922 Mon Sep 17 00:00:00 2001
From: "romain.biessy" <romain.biessy@codeplay.com>
Date: Mon, 5 Nov 2018 11:54:29 +0000
Subject: [PATCH] Fix type shadowing

---
 include/vptr/virtual_ptr.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/vptr/virtual_ptr.hpp b/include/vptr/virtual_ptr.hpp
index 34057e4..d7bcace 100644
--- a/include/vptr/virtual_ptr.hpp
+++ b/include/vptr/virtual_ptr.hpp
@@ -232,13 +232,13 @@ class PointerMapper {
   template <typename buffer_data_type = buffer_data_type_t>
   cl::sycl::buffer<buffer_data_type, 1> get_buffer(
       const virtual_pointer_t ptr) {
-    using buffer_t = cl::sycl::buffer<buffer_data_type, 1>;
+    using sycl_buffer_t = cl::sycl::buffer<buffer_data_type, 1>;
 
     // get_node() returns a `buffer_mem`, so we need to cast it to a `buffer<>`.
     // We can do this without the `buffer_mem` being a pointer, as we
     // only declare member variables in the base class (`buffer_mem`) and not in
     // the child class (`buffer<>).
-    return *(static_cast<buffer_t*>(&get_node(ptr)->second.m_buffer));
+    return *(static_cast<sycl_buffer_t*>(&get_node(ptr)->second.m_buffer));
   }
 
   /**
@@ -505,8 +505,8 @@ inline void* SYCLmalloc(size_t size, PointerMapper& pMap) {
     return nullptr;
   }
   // Create a generic buffer of the given size
-  using buffer_t = cl::sycl::buffer<buffer_data_type_t, 1>;
-  auto thePointer = pMap.add_pointer(buffer_t(cl::sycl::range<1>{size}));
+  using sycl_buffer_t = cl::sycl::buffer<buffer_data_type_t, 1>;
+  auto thePointer = pMap.add_pointer(sycl_buffer_t(cl::sycl::range<1>{size}));
   // Store the buffer on the global list
   return static_cast<void*>(thePointer);
 }