From 8c3766288bf4c01235639ea08be003ef0a4f4e71 Mon Sep 17 00:00:00 2001
From: Aaron van Geffen <aaron@aaronweb.net>
Date: Sun, 13 May 2018 23:22:40 +0200
Subject: [PATCH] Address clang 6.0 compilation errors.

---
 src/openrct2/core/Zip.cpp                 | 2 +-
 src/openrct2/object/ObjectFactory.cpp     | 4 ++--
 src/openrct2/object/ObjectJsonHelpers.cpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/openrct2/core/Zip.cpp b/src/openrct2/core/Zip.cpp
index 9f1df47751..737373c4e4 100644
--- a/src/openrct2/core/Zip.cpp
+++ b/src/openrct2/core/Zip.cpp
@@ -161,7 +161,7 @@ private:
         if (!path.empty())
         {
             // Convert back slashes to forward slashes
-            result = std::move(std::string(path));
+            result = std::string(path);
             for (auto ch = result.data(); *ch != '\0'; ch++)
             {
                 if (*ch == '\\')
diff --git a/src/openrct2/object/ObjectFactory.cpp b/src/openrct2/object/ObjectFactory.cpp
index 3e71e074eb..e8a01a99e9 100644
--- a/src/openrct2/object/ObjectFactory.cpp
+++ b/src/openrct2/object/ObjectFactory.cpp
@@ -104,9 +104,9 @@ public:
         bool loadImages,
         const IFileDataRetriever * fileDataRetriever)
         : _objectRepository(objectRepository),
+          _fileDataRetriever(fileDataRetriever),
           _objectName(objectName),
-          _loadImages(loadImages),
-          _fileDataRetriever(fileDataRetriever)
+          _loadImages(loadImages)
     {
     }
 
diff --git a/src/openrct2/object/ObjectJsonHelpers.cpp b/src/openrct2/object/ObjectJsonHelpers.cpp
index e47692b2a4..7a63121f1c 100644
--- a/src/openrct2/object/ObjectJsonHelpers.cpp
+++ b/src/openrct2/object/ObjectJsonHelpers.cpp
@@ -426,11 +426,11 @@ namespace ObjectJsonHelpers
                 if (json_is_string(el))
                 {
                     auto s = json_string_value(el);
-                    images = std::move(ParseImages(context, s));
+                    images = ParseImages(context, s);
                 }
                 else if (json_is_object(el))
                 {
-                    images = std::move(ParseImages(context, el));
+                    images = ParseImages(context, el);
                 }
                 for (const auto &g1 : images)
                 {