clover: Tidy up resource::mapping.

Tested-by: Tom Stellard <thomas.stellard@amd.com>
This commit is contained in:
Francisco Jerez 2013-09-15 23:07:10 -07:00
parent 6db102597a
commit 1d741e3ac0
2 changed files with 9 additions and 11 deletions

View file

@ -71,7 +71,7 @@ resource::add_map(command_queue &q, cl_map_flags flags, bool blocking,
void
resource::del_map(void *p) {
erase_if([&](mapping &m) {
erase_if([&](const mapping &m) {
return static_cast<void *>(m) == p;
}, maps);
}
@ -185,8 +185,9 @@ mapping::mapping(command_queue &q, resource &r,
mapping::mapping(mapping &&m) :
pctx(m.pctx), pxfer(m.pxfer), p(m.p) {
m.p = NULL;
m.pctx = NULL;
m.pxfer = NULL;
m.p = NULL;
}
mapping::~mapping() {

View file

@ -62,7 +62,7 @@ namespace clover {
friend class kernel;
protected:
resource(device &dev, clover::memory_obj &obj);
resource(device &dev, memory_obj &obj);
pipe_sampler_view *bind_sampler_view(command_queue &q);
void unbind_sampler_view(command_queue &q,
@ -86,8 +86,7 @@ namespace clover {
public:
root_resource(device &dev, memory_obj &obj,
command_queue &q, const std::string &data);
root_resource(device &dev, memory_obj &obj,
root_resource &r);
root_resource(device &dev, memory_obj &obj, root_resource &r);
virtual ~root_resource();
};
@ -109,19 +108,17 @@ namespace clover {
mapping(command_queue &q, resource &r, cl_map_flags flags,
bool blocking, const resource::vector &origin,
const resource::vector &region);
mapping(const mapping &m) = delete;
mapping(mapping &&m);
~mapping();
mapping &
operator=(mapping m);
operator void *() {
return p;
}
mapping(const mapping &m) = delete;
operator char *() {
return (char *)p;
template<typename T>
operator T *() const {
return (T *)p;
}
private: