3 files changed, 5 insertions, 3 deletions
diff --git a/platform/default/src/mbgl/storage/default_file_source.cpp b/platform/default/src/mbgl/storage/default_file_source.cpp
index 4d812044cf..1ccf999109 100644
--- a/platform/default/src/mbgl/storage/default_file_source.cpp
+++ b/platform/default/src/mbgl/storage/default_file_source.cpp
@@ -14,13 +14,14 @@
 #include <mbgl/util/stopwatch.hpp>
 
 #include <cassert>
+#include <utility>
 
 namespace mbgl {
 
 class DefaultFileSource::Impl {
 public:
     Impl(std::shared_ptr<FileSource> assetFileSource_, std::string cachePath, uint64_t maximumCacheSize)
-            : assetFileSource(assetFileSource_)
+            : assetFileSource(std::move(assetFileSource_))
             , localFileSource(std::make_unique<LocalFileSource>())
             , offlineDatabase(std::make_unique<OfflineDatabase>(cachePath, maximumCacheSize)) {
     }
diff --git a/platform/default/src/mbgl/storage/offline.cpp b/platform/default/src/mbgl/storage/offline.cpp
index fd945c724f..dd809ad129 100644
--- a/platform/default/src/mbgl/storage/offline.cpp
+++ b/platform/default/src/mbgl/storage/offline.cpp
@@ -10,6 +10,7 @@
 #include <rapidjson/writer.h>
 
 #include <cmath>
+#include <utility>
 
 namespace mbgl {
 
@@ -33,7 +34,7 @@ OfflineTilePyramidRegionDefinition::OfflineTilePyramidRegionDefinition(
 // OfflineGeometryRegionDefinition
 
 OfflineGeometryRegionDefinition::OfflineGeometryRegionDefinition(std::string styleURL_, Geometry<double> geometry_, double minZoom_, double maxZoom_, float pixelRatio_, bool includeIdeographs_)
-    : styleURL(styleURL_)
+    : styleURL(std::move(styleURL_))
     , geometry(std::move(geometry_))
     , minZoom(minZoom_)
     , maxZoom(maxZoom_)
diff --git a/platform/default/src/mbgl/text/bidi.cpp b/platform/default/src/mbgl/text/bidi.cpp
index 32a3dc23ef..6bb2d36446 100644
--- a/platform/default/src/mbgl/text/bidi.cpp
+++ b/platform/default/src/mbgl/text/bidi.cpp
@@ -180,7 +180,7 @@ std::vector<StyledText> BiDi::processStyledText(const StyledText& input, std::se
     
 std::u16string BiDi::writeReverse(const std::u16string& input, std::size_t logicalStart, std::size_t logicalEnd) {
     UErrorCode errorCode = U_ZERO_ERROR;
-    int32_t logicalLength = static_cast<int32_t>(logicalEnd - logicalStart);
+    auto logicalLength = static_cast<int32_t>(logicalEnd - logicalStart);
     std::u16string outputText(logicalLength + 1, 0);
     
     // UBIDI_DO_MIRRORING: Apply unicode mirroring of characters like parentheses