diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-02-20 09:49:42 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-20 09:49:42 +1100 |
commit | aa987a217779e71f97ee4c9cce531aec1c861bf8 (patch) | |
tree | e51fcce110306d93bf93870f13a5ff7d6b575427 /source/base/StarDirectoryAssetSource.cpp | |
parent | d0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff) | |
parent | 1c89042016c739815b2d70bcbef4673eef6b63e0 (diff) |
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/base/StarDirectoryAssetSource.cpp')
-rw-r--r-- | source/base/StarDirectoryAssetSource.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/base/StarDirectoryAssetSource.cpp b/source/base/StarDirectoryAssetSource.cpp index 675c64c..f375e4a 100644 --- a/source/base/StarDirectoryAssetSource.cpp +++ b/source/base/StarDirectoryAssetSource.cpp @@ -62,7 +62,7 @@ void DirectoryAssetSource::setMetadata(JsonObject metadata) { if (!m_metadataFile) m_metadataFile = String("/_metadata"); - m_metadata = move(metadata); + m_metadata = std::move(metadata); if (m_metadata.empty()) File::remove(toFilesystem(*m_metadataFile)); @@ -88,7 +88,7 @@ void DirectoryAssetSource::scanAll(String const& assetDirectory, StringList& out scanAll(assetPath + "/", output); } else { if (!shouldIgnore(assetPath)) - output.append(move(assetPath)); + output.append(std::move(assetPath)); } } } |