From 5726d2b357c1617891df5d19160d0e6478aa0e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Thu, 11 Feb 2016 12:17:33 +0100
Subject: [core] use std::move() to prevent copies

---
 include/mbgl/storage/resource.hpp       | 2 +-
 platform/default/online_file_source.cpp | 2 +-
 src/mbgl/annotation/annotation_tile.cpp | 2 +-
 src/mbgl/renderer/debug_bucket.cpp      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/mbgl/storage/resource.hpp b/include/mbgl/storage/resource.hpp
index 4c68e71003..edd9f58c72 100644
--- a/include/mbgl/storage/resource.hpp
+++ b/include/mbgl/storage/resource.hpp
@@ -31,7 +31,7 @@ public:
     Resource(Kind kind_, const std::string& url_, optional<TileData> tileData_ = {})
         : kind(kind_),
           url(url_),
-          tileData(tileData_) {
+          tileData(std::move(tileData_)) {
     }
 
     static Resource style(const std::string& url);
diff --git a/platform/default/online_file_source.cpp b/platform/default/online_file_source.cpp
index c4a0be2afc..a095b86fba 100644
--- a/platform/default/online_file_source.cpp
+++ b/platform/default/online_file_source.cpp
@@ -190,7 +190,7 @@ std::unique_ptr<FileRequest> OnlineFileSource::request(const Resource& resource,
 OnlineFileRequestImpl::OnlineFileRequestImpl(FileRequest* key_, const Resource& resource_, Callback callback_, OnlineFileSource::Impl& impl)
     : key(key_),
       resource(resource_),
-      callback(callback_) {
+      callback(std::move(callback_)) {
     // Force an immediate first request if we don't have an expiration time.
     schedule(impl, !resource.priorExpires);
 }
diff --git a/src/mbgl/annotation/annotation_tile.cpp b/src/mbgl/annotation/annotation_tile.cpp
index a4590ffe30..3a038cc6eb 100644
--- a/src/mbgl/annotation/annotation_tile.cpp
+++ b/src/mbgl/annotation/annotation_tile.cpp
@@ -10,7 +10,7 @@ AnnotationTileFeature::AnnotationTileFeature(FeatureType type_, GeometryCollecti
                                  std::unordered_map<std::string, std::string> properties_)
     : type(type_),
       properties(std::move(properties_)),
-      geometries(geometries_) {}
+      geometries(std::move(geometries_)) {}
 
 optional<Value> AnnotationTileFeature::getValue(const std::string& key) const {
     auto it = properties.find(key);
diff --git a/src/mbgl/renderer/debug_bucket.cpp b/src/mbgl/renderer/debug_bucket.cpp
index c4eb4e8b0b..909316a343 100644
--- a/src/mbgl/renderer/debug_bucket.cpp
+++ b/src/mbgl/renderer/debug_bucket.cpp
@@ -11,8 +11,8 @@ using namespace mbgl;
 
 DebugBucket::DebugBucket(const TileID id, const TileData::State state_, optional<SystemTimePoint> modified_, optional<SystemTimePoint> expires_, MapDebugOptions debugMode_)
     : state(state_),
-      modified(modified_),
-      expires(expires_),
+      modified(std::move(modified_)),
+      expires(std::move(expires_)),
       debugMode(debugMode_) {
     double baseline = 200;
     if (debugMode & MapDebugOptions::ParseStatus) {
-- 
cgit v1.2.1