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/core/StarAssetPath.cpp | |
parent | d0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff) | |
parent | 1c89042016c739815b2d70bcbef4673eef6b63e0 (diff) |
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/core/StarAssetPath.cpp')
-rw-r--r-- | source/core/StarAssetPath.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/core/StarAssetPath.cpp b/source/core/StarAssetPath.cpp index cb607fb..9a7833b 100644 --- a/source/core/StarAssetPath.cpp +++ b/source/core/StarAssetPath.cpp @@ -133,18 +133,18 @@ bool AssetPath::operator==(AssetPath const& rhs) const { } AssetPath::AssetPath(const char* path) { - *this = move(AssetPath::split(path)); + *this = AssetPath::split(path); } AssetPath::AssetPath(String const& path) { - *this = move(AssetPath::split(path)); + *this = AssetPath::split(path); } AssetPath::AssetPath(String&& basePath, Maybe<String>&& subPath, DirectivesGroup&& directives) { - this->basePath = move(basePath); - this->subPath = move(subPath); - this->directives = move(directives); + this->basePath = std::move(basePath); + this->subPath = std::move(subPath); + this->directives = std::move(directives); } AssetPath::AssetPath(String const& basePath, Maybe<String> const& subPath, DirectivesGroup const& directives) { @@ -176,7 +176,7 @@ DataStream& operator>>(DataStream& ds, AssetPath& path) { String string; ds.read(string); - path = move(string); + path = std::move(string); return ds; } |