make DefaultFileRequest movable only

This commit is contained in:
Konstantin Käfer
2015-05-08 11:34:46 +02:00
parent fb984a22d1
commit bd8d10bab6
2 changed files with 8 additions and 2 deletions

View File

@@ -85,7 +85,7 @@ void DefaultFileSource::Impl::add(Request* req) {
return;
}
request = &pending.emplace(resource, DefaultFileRequest(resource)).first->second;
request = &pending.emplace(resource, resource).first->second;
request->observers.insert(req);
if (cache) {

View File

@@ -19,8 +19,14 @@ struct DefaultFileRequest {
std::set<Request*> observers;
RequestBase* request = nullptr;
DefaultFileRequest(const Resource& resource_)
inline DefaultFileRequest(const Resource& resource_)
: resource(resource_) {}
// Make it movable-only
DefaultFileRequest(const DefaultFileRequest&) = delete;
inline DefaultFileRequest(DefaultFileRequest&&) = default;
DefaultFileRequest& operator=(const DefaultFileRequest&) = delete;
inline DefaultFileRequest& operator=(DefaultFileRequest&&) = default;
};
class DefaultFileSource::Impl {