mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Address clang 6.0 compilation errors.

This commit is contained in:
Aaron van Geffen 2018-05-13 23:22:40 +02:00
parent 4e86d18dad
commit 8c3766288b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/core/Zip.cpp
View File

@ -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 == '\\')

4
src/openrct2/object/ObjectFactory.cpp
View File

@ -104,9 +104,9 @@ public:
bool loadImages,
const IFileDataRetriever * fileDataRetriever)
: _objectRepository(objectRepository),
_fileDataRetriever(fileDataRetriever),
_objectName(objectName),
_loadImages(loadImages),
_fileDataRetriever(fileDataRetriever)
_loadImages(loadImages)
{
}

4
src/openrct2/object/ObjectJsonHelpers.cpp
View File

@ -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)
{