From 81151bd47489f39dedc3e9faa32679740c98bf01 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <benoit.steiner.goog@gmail.com>
Date: Sat, 19 Nov 2016 19:12:59 -0800
Subject: Fixed merge conflicts

---
 unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h')

diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h b/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h
index 3fe0219ac..5d5ddfcb7 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h
@@ -94,6 +94,10 @@ struct QueueInterface {
     }
   }
 
+  EIGEN_STRONG_INLINE void deallocate_all() const {
+    buffer_map.clear;
+  }
+
   EIGEN_STRONG_INLINE std::map<const uint8_t *, cl::sycl::buffer<uint8_t,1>>::iterator find_buffer(const void* ptr) const {
     auto it1 = buffer_map.find(static_cast<const uint8_t*>(ptr));
     if (it1 != buffer_map.end()){
-- 
cgit v1.2.3