Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
path: root/source/game/StarRoot.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'source/game/StarRoot.cpp')
-rw-r--r--source/game/StarRoot.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/source/game/StarRoot.cpp b/source/game/StarRoot.cpp
index 23abfd9..efb5e27 100644
--- a/source/game/StarRoot.cpp
+++ b/source/game/StarRoot.cpp
@@ -79,7 +79,7 @@ Root::Root(Settings settings) {
if (!s_singleton.compare_exchange_strong(oldRoot, this))
throw RootException("Singleton Root has been constructed twice");
- m_settings = move(settings);
+ m_settings = std::move(settings);
if (m_settings.runtimeConfigFile)
m_runtimeConfigFile = toStoragePath(*m_settings.runtimeConfigFile);
@@ -299,7 +299,7 @@ void Root::reload() {
void Root::reloadWithMods(StringList modDirectories) {
MutexLocker locker(m_modsMutex);
- m_modDirectories = move(modDirectories);
+ m_modDirectories = std::move(modDirectories);
reload();
}
@@ -363,7 +363,7 @@ void Root::fullyLoad() {
}
void Root::registerReloadListener(ListenerWeakPtr reloadListener) {
- m_reloadListeners.addListener(move(reloadListener));
+ m_reloadListeners.addListener(std::move(reloadListener));
}
String Root::toStoragePath(String const& path) const {
@@ -630,10 +630,10 @@ StringList Root::scanForAssetSources(StringList const& directories) {
}
} else {
namedSources[*assetSource->name] = assetSource;
- assetSources.append(move(assetSource));
+ assetSources.append(std::move(assetSource));
}
} else {
- assetSources.append(move(assetSource));
+ assetSources.append(std::move(assetSource));
}
}
}
@@ -675,11 +675,11 @@ StringList Root::scanForAssetSources(StringList const& directories) {
workingSet.remove(source);
- dependencySortedSources.add(move(source));
+ dependencySortedSources.add(std::move(source));
};
for (auto source : assetSources)
- dependencySortVisit(move(source));
+ dependencySortVisit(std::move(source));
StringList sourcePaths;
for (auto const& source : dependencySortedSources) {