Fixed merge conflicts

This commit is contained in:
Benoit Steiner
2016-11-19 19:12:59 -08:00
parent 2d1aec15a7
commit 81151bd474
2 changed files with 4 additions and 4 deletions

View File

@@ -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()){