From 067ff28d0ac5c35c399069457051e53f900696a0 Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Sun, 24 Mar 2019 17:15:37 +0200
Subject: [core] ResoureOptions explicit copy via clone()

---
 src/mbgl/map/map_options.cpp          | 3 +--
 src/mbgl/storage/resource_options.cpp | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/mbgl/map/map_options.cpp b/src/mbgl/map/map_options.cpp
index d0588a44eb..7c254476d6 100644
--- a/src/mbgl/map/map_options.cpp
+++ b/src/mbgl/map/map_options.cpp
@@ -13,8 +13,7 @@ public:
 // These requires the complete type of Impl.
 MapOptions::MapOptions() : impl_(std::make_unique<Impl>()) {}
 MapOptions::~MapOptions() = default;
-MapOptions::MapOptions(MapOptions&&) = default;
-MapOptions::MapOptions(const MapOptions& other) : impl_(std::make_unique<Impl>(*other.impl_)) {}
+MapOptions::MapOptions(MapOptions&&) noexcept = default;
 
 MapOptions& MapOptions::withMapMode(MapMode mode) {
     impl_->mapMode = mode;
diff --git a/src/mbgl/storage/resource_options.cpp b/src/mbgl/storage/resource_options.cpp
index 600b535228..c56a22540b 100644
--- a/src/mbgl/storage/resource_options.cpp
+++ b/src/mbgl/storage/resource_options.cpp
@@ -16,9 +16,13 @@ public:
 // These requires the complete type of Impl.
 ResourceOptions::ResourceOptions() : impl_(std::make_unique<Impl>()) {}
 ResourceOptions::~ResourceOptions() = default;
-ResourceOptions::ResourceOptions(ResourceOptions&&)  = default;
+ResourceOptions::ResourceOptions(ResourceOptions&&) noexcept = default;
 ResourceOptions::ResourceOptions(const ResourceOptions& other) : impl_(std::make_unique<Impl>(*other.impl_)) {}
 
+ResourceOptions ResourceOptions::clone() const {
+    return ResourceOptions(*this);
+}
+
 ResourceOptions& ResourceOptions::withAccessToken(std::string token) {
     impl_->accessToken = std::move(token);
     return *this;
-- 
cgit v1.2.1